remove check for editing when persisting, in SummaryWidget.js

[BUILD] Adds URLIndicator

API.md

@@ -879,6 +879,21 @@ 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.

bower.json

@@ -17,7 +17,7 @@
     "screenfull": "^3.0.0",
     "node-uuid": "^1.4.7",
     "comma-separated-values": "^3.6.4",
-    "FileSaver.js": "^0.0.2",
+    "file-saver": "^1.3.3",
     "zepto": "^1.1.6",
     "eventemitter3": "^1.2.0",
     "lodash": "3.10.1",

circle.yml

@@ -4,12 +4,6 @@ deployment:
     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:

example/generator/GeneratorProvider.js

@@ -59,7 +59,7 @@ define([
             if (domainObject.telemetry && domainObject.telemetry.hasOwnProperty(prop)) {
                 workerRequest[prop] = domainObject.telemetry[prop];
             }
-            if (request.hasOwnProperty(prop)) {
+            if (request && request.hasOwnProperty(prop)) {
                 workerRequest[prop] = request[prop];
             }
             if (!workerRequest[prop]) {

example/styleguide/res/templates/glyphs.html

@@ -127,7 +127,8 @@
 { 'meaning': 'Timer object', 'cssClass': 'icon-timer', 'cssContent': 'e1127', 'htmlEntity': '&#xe1127' },
 { 'meaning': 'Data Topic', 'cssClass': 'icon-topic', 'cssContent': 'e1128', 'htmlEntity': '&#xe1128' },
 { 'meaning': 'Fixed Position object', 'cssClass': 'icon-box-with-dashed-lines', 'cssContent': 'e1129', 'htmlEntity': '&#xe1129' },
-{ 'meaning': 'Summary Widget', 'cssClass': 'icon-summary-widget', 'cssContent': 'e1130', 'htmlEntity': '&#xe1130' }
+{ 'meaning': 'Summary Widget', 'cssClass': 'icon-summary-widget', 'cssContent': 'e1130', 'htmlEntity': '&#xe1130' },
+{ 'meaning': 'Notebook object', 'cssClass': 'icon-notebook', 'cssContent': 'e1131', 'htmlEntity': '&#xe1131' }
 ];
 "></div>
 

example/styleguide/res/templates/menus.html

@@ -121,7 +121,7 @@
         <h2>Palettes</h2>
         <div class="cols cols1-1">
             <div class="col">
-                <p>Use a palette to provide color choices. Similar to context menus and dropdowns, palettes should be dismissed when a choice is made within them, or if the user clicks outside one.</p>
+                <p>Use a palette to provide color choices. Similar to context menus and dropdowns, palettes should be dismissed when a choice is made within them, or if the user clicks outside one. Selected palette choices should utilize the <code>selected</code> CSS class to visualize indicate that state.</p>
                 <p>Note that while this example uses static markup for illustrative purposes, don't do this - use a front-end framework with repeaters to build the color choices.</p>
             </div>
             <mct-example><div style="height: 220px" title="Ignore me, I'm just here to provide space for this example.">
@@ -129,9 +129,9 @@
 <div class="s-button s-menu-button menu-element t-color-palette icon-paint-bucket" ng-controller="ClickAwayController as toggle">
     <span class="l-click-area" ng-click="toggle.toggle()"></span>
     <span class="color-swatch" style="background: rgb(255, 0, 0);"></span>
-    <div class="menu l-color-palette" ng-show="toggle.isActive()">
+    <div class="menu l-palette l-color-palette" ng-show="toggle.isActive()">
         <div class="l-palette-row l-option-row">
-            <div class="l-palette-item s-palette-item " ng-click="ngModel[field] = 'transparent'"></div>
+            <div class="l-palette-item s-palette-item no-selection"></div>
             <span class="l-palette-item-label">None</span>
         </div>
         <div class="l-palette-row">
@@ -147,7 +147,7 @@
             <div class="l-palette-item s-palette-item" style="background: rgb(255, 255, 255);"></div>
         </div>
         <div class="l-palette-row">
-            <div class="l-palette-item s-palette-item" style="background: rgb(136, 32, 32);"></div>
+            <div class="l-palette-item s-palette-item selected" style="background: rgb(255, 0, 0);"></div>
             <div class="l-palette-item s-palette-item" style="background: rgb(224, 64, 64);"></div>
             <div class="l-palette-item s-palette-item" style="background: rgb(240, 160, 72);"></div>
             <div class="l-palette-item s-palette-item" style="background: rgb(255, 248, 96);"></div>

index.html

@@ -25,8 +25,7 @@
     <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 src="bower_components/requirejs/require.js"> </script>
     <script>
         var THIRTY_MINUTES = 30 * 60 * 1000;
 
@@ -50,7 +49,7 @@
                         name: "Fixed",
                         timeSystem: 'utc',
                         bounds: {
-                            start: Date.now() - 30 * 60 * 1000,
+                            start: Date.now() - THIRTY_MINUTES,
                             end: Date.now()
                         }
                     },
@@ -65,6 +64,7 @@
                     }
                 ]
             }));
+            openmct.install(openmct.plugins.SummaryWidget());
             openmct.time.clock('local', {start: -THIRTY_MINUTES, end: 0});
             openmct.time.timeSystem('utc');
             openmct.start();

openmct.js

@@ -33,7 +33,7 @@ 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/FileSaver.js/FileSaver.min",
+        "saveAs": "bower_components/file-saver/FileSaver.min",
         "screenfull": "bower_components/screenfull/dist/screenfull.min",
         "text": "bower_components/text/text",
         "uuid": "bower_components/node-uuid/uuid",

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

@@ -22,7 +22,7 @@
 <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 contenteditable="true" 
+    <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)"

platform/commonUI/browse/src/ObjectHeaderController.js

@@ -32,7 +32,8 @@ define(
          */
         function ObjectHeaderController($scope) {
             this.$scope = $scope;
-            $scope.editing = false;
+            this.domainObject = $scope.domainObject;
+            this.editable = this.allowEdit();
         }
 
         /**
@@ -41,33 +42,49 @@ define(
          * @param event the mouse event
          */
         ObjectHeaderController.prototype.updateName = function (event) {
-            if (event && (event.type === 'blur' || event.which === 13)) {
-                var name = event.currentTarget.innerHTML;
+            if (!event || !event.currentTarget) {
+                return;
+            }
 
-                if (name.length === 0) {
-                    name = "Unnamed " + this.$scope.domainObject.getCapability("type").typeDef.name;
-                    event.currentTarget.innerHTML = name;
-                }
-
-                if (name !== this.$scope.domainObject.model.name) {
-                    this.$scope.domainObject.getCapability('mutation').mutate(function (model) {
-                        model.name = name;
-                    });
-                }
-
-                this.$scope.editing = false;
-
-                if (event.which === 13) {
-                    event.currentTarget.blur();
-                }
+            if (event.type === 'blur') {
+                this.updateModel(event);
+            } else if (event.which === 13) {
+                this.updateModel(event);
+                event.currentTarget.blur();
+                window.getSelection().removeAllRanges();
             }
         };
 
         /**
-         * Marks the status of the field as editing.
+         * Updates the model.
+         *
+         * @param event the mouse event
+         * @param private
          */
-        ObjectHeaderController.prototype.edit = function () {
-            this.$scope.editing = true;
+        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;

platform/commonUI/browse/test/ObjectHeaderControllerSpec.js

@@ -32,22 +32,27 @@ define(
                 mockTypeCapability,
                 mockEvent,
                 mockCurrentTarget,
+                model,
                 controller;
 
             beforeEach(function () {
                 mockMutationCapability = jasmine.createSpyObj("mutation", ["mutate"]);
-                mockTypeCapability = {
-                    typeDef: {
-                        name: ""
-                    }
-                };
+                mockTypeCapability = jasmine.createSpyObj("type", ["typeDef", "hasFeature"]);
+                mockTypeCapability.typeDef = { name: ""};
+                mockTypeCapability.hasFeature.andCallFake(function (feature) {
+                    return feature === 'creation';
+                });
+
                 mockCapabilities = {
                     mutation: mockMutationCapability,
                     type: mockTypeCapability
                 };
 
-                mockDomainObject = jasmine.createSpyObj("domainObject", ["getCapability", "model"]);
-                mockDomainObject.model = {name: "Test name"};
+                model = {
+                    name: "Test name"
+                };
+                mockDomainObject = jasmine.createSpyObj("domainObject", ["getCapability", "getModel"]);
+                mockDomainObject.getModel.andReturn(model);
                 mockDomainObject.getCapability.andCallFake(function (key) {
                     return mockCapabilities[key];
                 });
@@ -56,7 +61,7 @@ define(
                     domainObject: mockDomainObject
                 };
 
-                mockCurrentTarget = jasmine.createSpyObj("currentTarget", ["blur", "innerHTML"]);
+                mockCurrentTarget = jasmine.createSpyObj("currentTarget", ["blur", "textContent"]);
                 mockCurrentTarget.blur.andReturn(mockCurrentTarget);
 
                 mockEvent = {
@@ -70,7 +75,7 @@ define(
 
             it("updates the model with new name on blur", function () {
                 mockEvent.type = "blur";
-                mockCurrentTarget.innerHTML = "New name";
+                mockCurrentTarget.textContent = "New name";
                 controller.updateName(mockEvent);
 
                 expect(mockMutationCapability.mutate).toHaveBeenCalled();
@@ -78,23 +83,23 @@ define(
 
             it("updates the model with a default for blank names", function () {
                 mockEvent.type = "blur";
-                mockCurrentTarget.innerHTML = "";
+                mockCurrentTarget.textContent = "";
                 controller.updateName(mockEvent);
 
-                expect(mockCurrentTarget.innerHTML.length).not.toEqual(0);
+                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.innerHTML = mockDomainObject.model.name;
+                mockCurrentTarget.textContent = mockDomainObject.getModel().name;
                 controller.updateName(mockEvent);
 
                 expect(mockMutationCapability.mutate).not.toHaveBeenCalled();
             });
 
             it("updates the model on enter keypress event only", function () {
-                mockCurrentTarget.innerHTML = "New name";
+                mockCurrentTarget.textContent = "New name";
                 controller.updateName(mockEvent);
 
                 expect(mockMutationCapability.mutate).not.toHaveBeenCalled();
@@ -104,17 +109,29 @@ define(
 
                 expect(mockMutationCapability.mutate).toHaveBeenCalledWith(jasmine.any(Function));
 
-                mockMutationCapability.mutate.mostRecentCall.args[0](mockDomainObject.model);
+                mockMutationCapability.mutate.mostRecentCall.args[0](model);
 
-                expect(mockDomainObject.model.name).toBe("New name");
+                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);
+
+            });
         });
     }
 );

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

@@ -20,7 +20,7 @@
  at runtime from the About dialog for additional information.
 -->
 <div class="abs top-bar">
-    <div class="title">{{ngModel.title}}</div>
+    <div class="dialog-title">{{ngModel.title}}</div>
     <div class="hint">All fields marked <span class="req icon-asterisk"></span> are required.</div>
 </div>
 <div class='abs editor'>

platform/commonUI/dialog/res/templates/message.html

@@ -1,11 +1,10 @@
 <div class="l-message"
      ng-class="'message-severity-' + ngModel.severity">
-    <div class="ui-symbol type-icon message-type"></div>
-    <div class="message-contents">
+    <div class="w-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}}
@@ -25,8 +24,6 @@
                ng-click="ngModel.primaryOption.callback()">
                 {{ngModel.primaryOption.label}}
             </a>
-
         </div>
-
     </div>
 </div>

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

@@ -1,17 +1,17 @@
-<mct-container key="overlay" class="t-message-list">
-    <div class="message-contents">
-        <div class="abs top-bar">
-            <div class="title">{{ngModel.dialog.title}}</div>
+<mct-container key="overlay">
+    <div class="t-message-list">
+        <div class="top-bar">
+            <div class="dialog-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="abs message-body">
+        <div class="w-messages">
             <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="abs bottom-bar">
+        <div class="bottom-bar">
             <a ng-repeat="dialogAction in ngModel.dialog.actions"
                class="s-button major"
                ng-click="dialogAction.action()">

platform/commonUI/dialog/res/templates/overlay-options.html

@@ -21,7 +21,7 @@
 -->
 <mct-container key="overlay">
     <div class="abs top-bar">
-        <div class="title">{{ngModel.dialog.title}}</div>
+        <div class="dialog-title">{{ngModel.dialog.title}}</div>
         <div class="hint">{{ngModel.dialog.hint}}</div>
     </div>
     <div class='abs editor'>

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

@@ -101,10 +101,15 @@ define(
          */
         EditorCapability.prototype.finish = function () {
             var domainObject = this.domainObject;
-            return this.transactionService.cancel().then(function () {
-                domainObject.getCapability("status").set("editing", false);
-                return domainObject;
-            });
+
+            if (this.transactionService.isActive()) {
+                return this.transactionService.cancel().then(function () {
+                    domainObject.getCapability("status").set("editing", false);
+                    return domainObject;
+                });
+            } else {
+                return Promise.resolve(domainObject);
+            }
         };
 
         /**

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

@@ -62,6 +62,7 @@ define(
                 );
                 mockTransactionService.commit.andReturn(fastPromise());
                 mockTransactionService.cancel.andReturn(fastPromise());
+                mockTransactionService.isActive = jasmine.createSpy('isActive');
 
                 mockStatusCapability = jasmine.createSpyObj(
                     "statusCapability",
@@ -141,6 +142,7 @@ define(
 
             describe("finish", function () {
                 beforeEach(function () {
+                    mockTransactionService.isActive.andReturn(true);
                     capability.edit();
                     capability.finish();
                 });
@@ -152,6 +154,23 @@ define(
                 });
             });
 
+            describe("finish", function () {
+                beforeEach(function () {
+                    mockTransactionService.isActive.andReturn(false);
+                    capability.edit();
+                });
+
+                it("does not cancel transaction when transaction is not active", function () {
+                    capability.finish();
+                    expect(mockTransactionService.cancel).not.toHaveBeenCalled();
+                });
+
+                it("returns a promise", function () {
+                    expect(capability.finish() instanceof Promise).toBe(true);
+                });
+
+            });
+
             describe("dirty", function () {
                 var model = {};
 

platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json

@@ -2,7 +2,7 @@
   "metadata": {
     "name": "openmct-symbols-16px",
     "lastOpened": 0,
-    "created": 1505151140023
+    "created": 1506973656040
   },
   "iconSets": [
     {
@@ -899,6 +899,14 @@
           "prevSize": 24,
           "code": 921904,
           "tempChar": ""
+        },
+        {
+          "order": 139,
+          "id": 117,
+          "name": "icon-notebook",
+          "prevSize": 24,
+          "code": 921905,
+          "tempChar": ""
         }
       ],
       "metadata": {
@@ -3524,6 +3532,29 @@
               {}
             ]
           }
+        },
+        {
+          "id": 117,
+          "paths": [
+            "M896 110.8c0-79.8-55.4-127.4-123-105.4l-773 250.6h896v-145.2z",
+            "M896 320h-896v576c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-448c0-70.4-57.6-128-128-128zM832 832h-384v-320h384v320z"
+          ],
+          "attrs": [
+            {},
+            {}
+          ],
+          "isMulticolor": false,
+          "isMulticolor2": false,
+          "grid": 16,
+          "tags": [
+            "icon-notebook"
+          ],
+          "colorPermutations": {
+            "1161751207457516161751": [
+              {},
+              {}
+            ]
+          }
         }
       ],
       "colorThemes": [

platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg

@@ -118,4 +118,5 @@
 <glyph unicode="&#xe1128;" glyph-name="icon-topic" d="M454.36 483.36l86.3 86.3c9.088 8.965 21.577 14.502 35.36 14.502s26.272-5.537 35.366-14.507l86.294-86.294c19.328-19.358 42.832-34.541 69.047-44.082l1.313 171.722-57.64 57.64c-34.407 34.33-81.9 55.558-134.35 55.558s-99.943-21.228-134.354-55.562l-86.296-86.297c-9.088-8.965-21.577-14.502-35.36-14.502s-26.272 5.537-35.366 14.507l-28.674 28.654v-172.14c19.045-7.022 41.040-11.084 63.984-11.084 52.463 0 99.966 21.239 134.379 55.587zM505.64 412.64l-86.3-86.3c-9.088-8.965-21.577-14.502-35.36-14.502s-26.272 5.537-35.366 14.507l-86.294 86.294c-2 2-4.2 4-6.36 6v-197.36c33.664-30.72 78.65-49.537 128.031-49.537 52.44 0 99.923 21.22 134.333 55.541l86.296 86.296c9.088 8.965 21.577 14.502 35.36 14.502s26.272-5.537 35.366-14.507l86.294-86.294c2-2 4.2-4 6.36-6v197.36c-33.664 30.72-78.65 49.537-128.031 49.537-52.44 0-99.923-21.22-134.333-55.541zM832 960h-128v-192h127.66l0.34-0.34v-639.32l-0.34-0.34h-127.66v-192h128c105.6 0 192 86.4 192 192v640c0 105.6-86.4 192-192 192zM320 128h-127.66l-0.34 0.34v639.32l0.34 0.34h127.66v192h-128c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192h128v192z" />
 <glyph unicode="&#xe1129;" glyph-name="icon-box-with-dashed-lines" d="M0 576h128v-256h-128v256zM128 831.78l0.22 0.22h191.78v128h-192c-70.606-0.215-127.785-57.394-128-127.979v-192.021h128v191.78zM128 64.22v191.78h-128v-192c0.215-70.606 57.394-127.785 127.979-128h192.021v128h-191.78zM384 960h256v-128h-256v128zM896 64.22l-0.22-0.22h-191.78v-128h192c70.606 0.215 127.785 57.394 128 127.979v192.021h-128v-191.78zM896 960h-192v-128h191.78l0.22-0.22v-191.78h128v192c-0.215 70.606-57.394 127.785-127.979 128zM896 576h128v-256h-128v256zM384 64h256v-128h-256v128zM256 704h512v-512h-512v512z" />
 <glyph unicode="&#xe1130;" glyph-name="icon-summary-widget" d="M896 960h-768c-70.4 0-128-57.6-128-128v-768c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v768c0 70.4-57.6 128-128 128zM847.8 349.6l-82.6-143.2-189.6 131.6 19.2-230h-165.4l19.2 230-189.6-131.6-82.6 143.2 208.6 98.4-208.8 98.4 82.6 143.2 189.6-131.6-19.2 230h165.4l-19.2-230 189.6 131.6 82.6-143.2-208.6-98.4 208.8-98.4z" />
+<glyph unicode="&#xe1131;" glyph-name="icon-notebook" d="M896 849.2c0 79.8-55.4 127.4-123 105.4l-773-250.6h896v145.2zM896 640h-896v-576c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v448c0 70.4-57.6 128-128 128zM832 128h-384v320h384v-320z" />
 </font></defs></svg>

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

@@ -137,6 +137,11 @@
         min-height: 0;
         &.holder:not(:last-child) { margin-bottom: $interiorMarginLg; }
     }
+    &.l-flex-accordion .flex-accordion-holder {
+        display: flex;
+        flex-direction: column;
+        //overflow: hidden !important;
+    }
     .flex-container { @include flex-direction(column); }
 }
 

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

@@ -180,6 +180,20 @@ a.disabled {
     @include ellipsize();
 }
 
+.no-selection {
+    // aka selection = "None". Used in palettes and their menu buttons.
+    $c: red; $s: 48%; $e: 52%;
+    @include background-image(linear-gradient(-45deg,
+        transparent $s - 5%,
+        $c $s,
+        $c $e,
+        transparent $e + 5%
+    ));
+    background-repeat: no-repeat;
+    background-size: contain;
+}
+
+
 .scrolling,
 .scroll {
     overflow: auto;

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

@@ -146,6 +146,7 @@ $glyph-icon-timer: '\e1127';
 $glyph-icon-topic: '\e1128';
 $glyph-icon-box-with-dashed-lines: '\e1129';
 $glyph-icon-summary-widget: '\e1130';
+$glyph-icon-notebook: '\e1131';
 
 /************************** 16 PX CLASSES */
 
@@ -260,6 +261,7 @@ $glyph-icon-summary-widget: '\e1130';
 .icon-topic {  @include glyphBefore($glyph-icon-topic); }
 .icon-box-with-dashed-lines {  @include glyphBefore($glyph-icon-box-with-dashed-lines); }
 .icon-summary-widget {  @include glyphBefore($glyph-icon-summary-widget); }
+.icon-notebook {  @include glyphBefore($glyph-icon-notebook); }
 
 /************************** 12 PX CLASSES */
 .icon-crosshair-12px {  @include glyphBefore($glyph-icon-crosshair,'symbolsfont-12px'); }

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

@@ -26,5 +26,6 @@
         display: block;
         height: 100%;
         width: 100%;
+        border: none;
     }
 }

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

@@ -37,7 +37,7 @@
 /********************************* CONTROLS */
 @import "controls/breadcrumb";
 @import "controls/buttons";
-@import "controls/color-palette";
+@import "controls/palette";
 @import "controls/controls";
 @import "controls/lists";
 @import "controls/menus";
@@ -80,3 +80,4 @@
 @import "autoflow";
 @import "features/imagery";
 @import "features/time-display";
+@import "widgets";

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

@@ -50,7 +50,6 @@
         content:'';
         font-family: symbolsfont;
         font-size: 0.8em;
-        display: inline;
         margin-right: $interiorMarginSm;
     }
 }

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

@@ -0,0 +1,306 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+/************************************************************* WIDGET OBJECT */
+.l-summary-widget {
+    // Widget layout classes here
+    @include ellipsize();
+    display: inline-block;
+    text-align: center;
+    .widget-label:before {
+        // Widget icon
+        font-size: 0.9em;
+        margin-right: $interiorMarginSm;
+    }
+}
+
+.s-summary-widget {
+    // Widget style classes here
+    @include boxShdw($shdwBtns);
+    border-radius: $basicCr;
+    border-style: solid;
+    border-width: 1px;
+    box-sizing: border-box;
+    cursor: default;
+    font-size: 0.8rem;
+    padding: $interiorMarginLg $interiorMarginLg * 2;
+    &[href] {
+        cursor: pointer;
+    }
+}
+
+.widget-edit-holder {
+    // Hide edit area when in browse mode
+    display: none;
+}
+
+.widget-rule-header {
+    @extend .l-flex-row;
+    @include align-items(center);
+    margin-bottom: $interiorMargin;
+    > .flex-elem {
+        &:not(:first-child) {
+            margin-left: $interiorMargin;
+        }
+    }
+}
+
+.widget-rules-wrapper,
+.widget-rule-content,
+.w-widget-test-data-content {
+    @include trans-prop-nice($props: (height, min-height, opacity), $dur: 250ms);
+    min-height: 0;
+    height: 0;
+    opacity: 0;
+    overflow: hidden;
+    pointer-events: none;
+}
+
+.widget-rules-wrapper {
+    flex: 1 1 auto !important;
+}
+
+.widget-rule-content.expanded {
+    overflow: visible !important;
+    min-height: 50px;
+    height: auto;
+    opacity: 1;
+    pointer-events: inherit;
+}
+
+.w-widget-test-data-content {
+    .l-enable {
+        padding: $interiorMargin 0;
+    }
+
+    .w-widget-test-data-items {
+        max-height: 20vh;
+        overflow-y: scroll !important;
+        padding-right: $interiorMargin;
+    }
+}
+
+.l-widget-thumb-wrapper,
+.l-compact-form label {
+    $ruleLabelW: 40%;
+    $ruleLabelMaxW: 150px;
+    @include display(flex);
+    max-width: $ruleLabelMaxW;
+    width: $ruleLabelW;
+}
+
+.t-message-widget-no-data {
+    display: none;
+}
+
+/********************************************************** EDITING A WIDGET */
+.s-status-editing > mct-view > .w-summary-widget {
+    // Classes for editor layout while editing a widget
+    // This selector is ugly and brittle, but needed to prevent interface from showing when widget is in a layout
+    // being edited.
+    @include absPosDefault();
+    @extend .l-flex-col;
+
+    > .l-summary-widget {
+        // Main view of the summary widget
+        // Give some airspace and center the widget in the area
+        margin: 30px auto;
+    }
+
+    .widget-edit-holder {
+        display: flex; // Overrides `display: none` during Browse mode
+        .flex-accordion-holder {
+            // Needed because otherwise accordion elements "creep" when contents expand and contract
+            display: block !important;
+        }
+        &.expanded-widget-test-data {
+            .w-widget-test-data-content {
+                min-height: 50px;
+                height: auto;
+                opacity: 1;
+                pointer-events: inherit;
+            }
+            &:not(.expanded-widget-rules) {
+                // Test data is expanded and rules are collapsed
+                // Make text data take up all the vertical space
+                .flex-accordion-holder { display: flex; }
+                .widget-test-data {
+                    flex-grow: 999999;
+                }
+                .w-widget-test-data-items {
+                    max-height: inherit;
+                }
+            }
+        }
+        &.expanded-widget-rules {
+            .widget-rules-wrapper {
+                min-height: 50px;
+                height: auto;
+                opacity: 1;
+                pointer-events: inherit;
+            }
+        }
+    }
+
+    &.s-status-no-data {
+        .widget-edit-holder {
+            opacity: 0.3;
+            pointer-events: none;
+        }
+        .t-message-widget-no-data {
+            display: flex;
+        }
+    }
+
+
+    .l-compact-form {
+        // Overrides on .l-compact-form
+        ul {
+            &:last-child { margin: 0; }
+            li {
+                @include align-items(flex-start);
+                @include flex-wrap(nowrap);
+                line-height: 230%; // Provide enough space when controls wrap
+                padding: 2px 0;
+                &:not(.widget-rule-header) {
+                    &:not(.connects-to-previous) {
+                        border-top: 1px solid $colorFormLines;
+                    }
+                }
+                &.connects-to-previous {
+                    padding: $interiorMargin 0;
+                }
+
+                > label {
+                    display: block; // Needed to align text to right
+                    text-align: right;
+                }
+            }
+        }
+
+        &.s-widget-test-data-item {
+            // Single line of ul li label span, etc.
+            ul {
+                li {
+                    border: none !important;
+                    > label {
+                        display: inline-block;
+                        width: auto;
+                        text-align: left;
+                    }
+                }
+            }
+        }
+    }
+}
+
+.widget-edit-holder {
+    font-size: 0.8rem;
+}
+
+.widget-rules-wrapper {
+    // Wrapper area that holds n rules
+    box-sizing: border-box;
+    overflow-y: scroll;
+    padding-right: $interiorMargin;
+}
+
+.l-widget-rule,
+.l-widget-test-data-item {
+    box-sizing: border-box;
+    margin-bottom: $interiorMarginSm;
+    padding: $interiorMargin $interiorMarginLg;
+}
+
+.l-widget-thumb-wrapper {
+    @extend .l-flex-row;
+    @include align-items(center);
+    > span { display: block; }
+    .grippy-holder,
+    .view-control {
+        margin-right: $interiorMargin;
+        width: 1em;
+        height: 1em;
+    }
+
+    .widget-thumb {
+        @include flex(1 1 auto);
+        width: 100%;
+    }
+}
+
+.rule-title {
+    @include flex(0 1 auto);
+    color: pullForward($colorBodyFg, 50%);
+}
+
+.rule-description {
+    @include flex(1 1 auto);
+    @include ellipsize();
+    color: pushBack($colorBodyFg, 20%);
+}
+
+.s-widget-rule,
+.s-widget-test-data-item {
+    background-color: rgba($colorBodyFg, 0.1);
+    border-radius: $basicCr;
+}
+
+.widget-thumb {
+    @include ellipsize();
+    @extend .s-summary-widget;
+    @extend .l-summary-widget;
+    padding: $interiorMarginSm $interiorMargin;
+}
+
+// Hide and show elements in the rule-header on hover
+.l-widget-rule,
+.l-widget-test-data-item {
+    .grippy,
+    .l-rule-action-buttons-wrapper,
+    .l-condition-action-buttons-wrapper,
+    .l-widget-test-data-item-action-buttons-wrapper {
+        @include trans-prop-nice($props: opacity, $dur: 500ms);
+        opacity: 0;
+    }
+    &:hover {
+        .grippy,
+        .l-rule-action-buttons-wrapper,
+        .l-widget-test-data-item-action-buttons-wrapper {
+            @include trans-prop-nice($props: opacity, $dur: 0);
+            opacity: 1;
+        }
+    }
+    .l-rule-action-buttons-wrapper {
+          .t-delete {
+            margin-left: 10px;
+          }
+    }
+    .t-condition {
+        &:hover {
+            .l-condition-action-buttons-wrapper {
+                @include trans-prop-nice($props: opacity, $dur: 0);
+                opacity: 1;
+            }
+        }
+    }
+}

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

@@ -261,7 +261,7 @@ input[type="number"] {
 input[type="text"].lg {  width: 100% !important; }
 .l-input-med input[type="text"],
 input[type="text"].med { width: 200px !important; }
-input[type="text"].sm {  width: 50px !important; }
+input[type="text"].sm, input[type="number"].sm {  width: 50px !important; }
 .l-numeric input[type="text"],
 input[type="text"].numeric { text-align: right; }
 
@@ -317,14 +317,10 @@ input[type="text"].s-input-inline,
 .select {
     @include btnSubtle($bg: $colorSelectBg);
     @extend .icon-arrow-down; // Context arrow
-    @if $shdwBtns != none {
-        margin: 0 0 2px 0; // Needed to avoid dropshadow from being clipped by parent containers
-    }
     display: inline-block;
     padding: 0 $interiorMargin;
     overflow: hidden;
     position: relative;
-    line-height: $formInputH;
     select {
         @include appearance(none);
         box-sizing: border-box;
@@ -340,11 +336,13 @@ input[type="text"].s-input-inline,
         }
     }
     &:before {
-        pointer-events: none;
+        @include transform(translateY(-50%));
         color: rgba($colorInvokeMenu, percentToDecimal($contrastInvokeMenuPercent));
         display: block;
+        pointer-events: none;
         position: absolute;
-        right: $interiorMargin; top: 0;
+        right: $interiorMargin;
+        top: 50%;
     }
 }
 
@@ -396,8 +394,7 @@ input[type="text"].s-input-inline,
     .l-elem-wrapper {
         mct-representation {
             // Holds the context-available item
-            // Must have min-width to make flex work properly
-            // in Safari
+            // Must have min-width to make flex work properly in Safari
             min-width: 0.7em;
         }
     }
@@ -563,7 +560,6 @@ input[type="text"].s-input-inline,
     height: $h;
     margin-top: 1 + floor($h/2) * -1;
     @include btnSubtle(pullForward($colorBtnBg, 10%));
-    //border-radius: 50% !important;
 }
 
 @mixin sliderKnobRound() {
@@ -578,7 +574,6 @@ input[type="text"].s-input-inline,
 
 input[type="range"] {
     // HTML5 range inputs
-
     -webkit-appearance: none; /* Hides the slider so that custom slider can be made */
     background: transparent; /* Otherwise white in Chrome */
     &:focus {
@@ -736,6 +731,30 @@ textarea {
     }
 }
 
+.view-switcher,
+.t-btn-view-large {
+    @include trans-prop-nice-fade($controlFadeMs);
+}
+
+.view-control {
+    @extend .icon-arrow-right;
+    cursor: pointer;
+    font-size: 0.75em;
+    &:before {
+        position: absolute;
+        @include trans-prop-nice(transform, 100ms);
+        @include transform-origin(center);
+    }
+    &.expanded:before {
+        @include transform(rotate(90deg));
+    }
+}
+
+.grippy {
+    @extend .icon-grippy;
+    cursor: move;
+}
+
 /******************************************************** BROWSER ELEMENTS */
 body.desktop {
     ::-webkit-scrollbar {

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

@@ -29,23 +29,27 @@
     }
 
     .icon {
-        font-size: 16px; //120%;
+        font-size: 16px;
     }
 
     .title-label {
         margin-left: $interiorMarginSm;
     }
 
+    .icon-swatch,
     .color-swatch {
         // Used in color menu buttons in toolbar
         $d: 10px;
         display: inline-block;
         border: 1px solid rgba($colorBtnFg, 0.2);
-        height: $d;
-        width: $d;
+        height: $d; width: $d;
+        line-height: $d;
         vertical-align: middle;
         margin-left: $interiorMarginSm;
         margin-top: -2px;
+        &:not(.no-selection) {
+            border-color: transparent;
+        }
     }
 
     &:after {

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

@@ -19,7 +19,7 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-
+/******************************************************************* STATUS BLOCK ELEMS */
 @mixin statusBannerColors($bg, $fg: $colorStatusFg) {
 	$bgPb: 30%;
 	$bgPbD: 10%;
@@ -120,7 +120,11 @@
 	}
 
 	.status-indicator {
+        background: none !important;
 		margin-right: $interiorMarginSm;
+        &[class*='s-status']:before {
+            font-size: 1em;
+        }
 	}
 
 	.count {
@@ -136,7 +140,7 @@
     }
 }
 
-/* Styles for messages and message banners */
+/******************************************************************* MESSAGE BANNERS */
 .message {
 	&.block {
 		border-radius: $basicCr;
@@ -192,7 +196,6 @@
 		padding: 0 $interiorMargin;
 	}
     .close {
-		//@include test(red, 0.7);
 		cursor: pointer;
         font-size: 7px;
 		width: 8px;
@@ -236,132 +239,147 @@
     }
 }
 
-@mixin messageBlock($iconW: 32px) {
-    .type-icon.message-type {
+/******************************************************************* MESSAGES */
+
+/* Contexts:
+    In .t-message-list
+    In .overlay as a singleton
+    Inline in the view area
+ */
+
+// Archetypal message
+.l-message {
+    $iconW: 32px;
+    @include display(flex);
+    @include flex-direction(row);
+    @include align-items(stretch);
+    padding: $interiorMarginLg;
+
+    &:before {
+        // Icon
+        @include flex(0 1 auto);
         @include txtShdw($shdwStatusIc);
         @extend .icon-bell;
         color: $colorStatusDefault;
         font-size: $iconW;
-        padding: 1px;
         width: $iconW + 2;
+        margin-right: $interiorMarginLg;
     }
 
-    .message-severity-info .type-icon.message-type {
+    &.message-severity-info:before {
         @extend .icon-info;
         color: $colorInfo;
     }
-    .message-severity-alert .type-icon.message-type {
-        @extend .icon-bell;
+
+    &.message-severity-alert:before {
         color: $colorWarningLo;
     }
-    .message-severity-error .type-icon.message-type {
+
+    &.message-severity-error:before {
         @extend .icon-alert-rect;
         color: $colorWarningHi;
     }
 }
-/* Paths:
-    t-dialog | t-dialog-sm > t-message-single | t-message-list > overlay > holder > contents > l-message >
-        message-type > (icon)
-        message-contents >
-        top-bar >
-            title
-            hint
-        editor >
-            (if displaying list of messages)
-            ul > li > l-message >
-                ... same as above
-        bottom-bar
-*/
 
-.l-message {
+
+.w-message-contents {
+    @include flex(1 1 auto);
     @include display(flex);
-    @include flex-direction(row);
-    @include align-items(stretch);
-    .type-icon.message-type {
-        @include flex(0 1 auto);
-        position: relative;
-    }
-    .message-contents {
-        @include flex(1 1 auto);
-        margin-left: $overlayMargin;
-        position: relative;
+    @include flex-direction(column);
 
-        .top-bar,
+    > div,
+    > span {
+        //@include test(red);
+        margin-bottom: $interiorMargin;
+    }
+
+    .message-body {
+        @include flex(1 1 100%);
+    }
+}
+
+// Singleton in an overlay dialog
+.t-message-single .l-message,
+.t-message-single.l-message {
+        $iconW: 80px;
+        @include absPosDefault();
+        padding: 0;
+        &:before {
+            font-size: $iconW;
+            width: $iconW + 2;
+        }
+        .title {
+            font-size: 1.2em;
+        }
+}
+
+// Singleton inline in a view
+.t-message-inline .l-message,
+.t-message-inline.l-message {
+    border-radius: $controlCr;
+    &.message-severity-info { background-color: rgba($colorInfo, 0.3); }
+    &.message-severity-alert { background-color: rgba($colorWarningLo, 0.3); }
+    &.message-severity-error { background-color: rgba($colorWarningHi, 0.3); }
+
+    .w-message-contents.l-message-body-only {
         .message-body {
-            margin-bottom: $interiorMarginLg * 2;
+            margin-top: $interiorMargin;
         }
     }
 }
 
+// In a list
+.t-message-list {
+    @include absPosDefault();
+    @include display(flex);
+    @include flex-direction(column);
 
-// Message as singleton
-.t-message-single {
-    @include messageBlock(80px);
-}
-
-body.desktop .t-message-single {
-    .l-message,
-    .bottom-bar {
-        @include absPosDefault();
+    > div,
+    > span {
+        margin-bottom: $interiorMargin;
     }
 
-    .bottom-bar {
-        top: auto;
-        height: $ovrFooterH;
+    .w-messages {
+        @include flex(1 1 100%);
+        overflow-y: auto;
+        padding-right: $interiorMargin;
     }
+    // Each message
+    .l-message {
+        border-radius: $controlCr;
+        background: rgba($colorOvrFg, 0.1);
+        margin-bottom: $interiorMargin;
+        .hint,
+        .bottom-bar {
+            text-align: left;
+        }
+    }
+
 }
 
 @include phonePortrait {
-    .t-message-single {
-        .l-message {
-            @include flex-direction(column);
-            .message-contents { margin-left: 0; }
-        }
-        .type-icon.message-type {
+    .t-message-single .l-message,
+    .t-message-single.l-message {
+        @include flex-direction(column);
+        &:before {
+            margin-right: 0;
             margin-bottom: $interiorMarginLg;
-            width: 100%;
             text-align: center;
+            width: 100%;
         }
 
         .bottom-bar {
-            text-align: center !important;
-        }
-    }
-}
-
-// Messages in list
-.t-message-list {
-    @include messageBlock(32px);
-
-    .message-contents {
-        .l-message {
-            border-radius: $controlCr;
-            background: rgba($colorOvrFg, 0.1);
-            margin-bottom: $interiorMargin;
-            padding: $interiorMarginLg;
-
-            .message-contents,
-            .bottom-bar {
-                position: relative;
-            }
-
-            .message-contents {
-                font-size: 0.9em;
-                margin-left: $interiorMarginLg;
-                .message-action { color: pushBack($colorOvrFg, 20%); }
-                .bottom-bar { text-align: left; }
-            }
-
-            .top-bar,
-            .message-body {
-                margin-bottom: $interiorMarginLg;
+            text-align: center;
+            .s-button {
+                display: block;
+                width: 100%;
             }
         }
     }
 }
 
 body.desktop .t-message-list {
-    .message-contents .l-message { margin-right: $interiorMarginLg; }
+    .w-message-contents { padding-right: $interiorMargin; }
 }
 
 // Alert elements in views

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

@@ -19,11 +19,10 @@
  * this source code distribution or the Licensing information page available
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
-.l-color-palette {
+.l-palette {
 	$d: 16px;
 	$colorsPerRow: 10;
 	$m: 1;
-	$colorSelectedColor: #fff;
 
 	box-sizing: border-box;
 	padding: $interiorMargin !important;
@@ -33,46 +32,41 @@
 		line-height: $d;
 		width: ($d * $colorsPerRow) + ($m * $colorsPerRow);
 
+        &.l-option-row {
+            margin-bottom: $interiorMargin;
+            .s-palette-item {
+                border-color: $colorPaletteFg;
+            }
+        }
+
 		.l-palette-item {
 			box-sizing: border-box;
-			@include txtShdwSubtle(0.8);
-			@include trans-prop-nice-fade(0.25s);
-			border: 1px solid transparent;
-			color: $colorSelectedColor;
 			display: block;
 			float: left;
 			height: $d; width: $d;
 			line-height: $d * 0.9;
 			margin: 0 ($m * 1px) ($m * 1px) 0;
+            position: relative;
 			text-align: center;
-            &:before {
-                // Check mark for selected items
-                font-size: 0.8em;
-            }
 		}
 
 		.s-palette-item {
+            border: 1px solid transparent;
+            color: $colorPaletteFg;
+            text-shadow: $shdwPaletteFg;
+            @include trans-prop-nice-fade(0.25s);
 			&:hover {
 				@include trans-prop-nice-fade(0);
-				border-color: $colorSelectedColor !important;
+				border-color: $colorPaletteSelected !important;
 			}
+            &.selected {
+                border-color: $colorPaletteSelected;
+                box-shadow: $shdwPaletteSelected; //Needed to see selection rect on light colored swatches
+            }
 		}
 
 		.l-palette-item-label {
 			margin-left: $interiorMargin;
 		}
-
-		&.l-option-row {
-			margin-bottom: $interiorMargin;
-			.s-palette-item {
-				border-color: $colorBodyFg;
-			}
-		}
 	}
-
-
-
-
-
-
-}
+}

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

@@ -20,7 +20,19 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 .section-header {
+    border-radius: $basicCr;
+    background: $colorFormSectionHeader;
+    color: lighten($colorBodyFg, 20%);
+    font-size: inherit;
+    margin: $interiorMargin 0;
+    padding: $formTBPad $formLRPad;
     text-transform: uppercase;
+    .view-control {
+        display: inline-block;
+        margin-right: $interiorMargin;
+        width: 1em;
+        height: 1em;
+    }
 }
 
 .form {
@@ -41,15 +53,6 @@
         }
     }
 
-    .section-header {
-        border-radius: $basicCr;
-        background: $colorFormSectionHeader;
-        $c: lighten($colorBodyFg, 20%);
-        color: $c;
-        font-size: 0.8em;
-        padding: $formTBPad $formLRPad;
-    }
-
 	.form-row {
 		$m: $interiorMargin;
 		box-sizing: border-box;
@@ -57,9 +60,6 @@
         margin-bottom: $interiorMarginLg * 2;
 		padding: $formTBPad 0;
 		position: relative;
-        //&ng-form {
-        //    display: block;
-        //}
 
 		&.first {
 			border-top: none;
@@ -171,3 +171,106 @@
 		padding: $interiorMargin;
 	}
 }
+
+/**************************************************************************** COMPACT FORM */
+// ul > li > label, control
+// Make a new UL for each form section
+// Allow control-first, controls-below
+// TO-DO: migrate work in branch ch-plot-styling that users .inspector-config to use classes below instead
+
+.l-compact-form .tree ul li,
+.l-compact-form ul li {
+    padding: 2px 0;
+}
+
+
+.l-compact-form {
+    $labelW: 40%;
+    $minW: $labelW;
+    ul {
+        margin-bottom: $interiorMarginLg;
+        li {
+            @include display(flex);
+            @include flex-wrap(wrap);
+            @include align-items(center);
+            label,
+            .control {
+                @include display(flex);
+            }
+            label {
+                line-height: inherit;
+                width: $labelW;
+            }
+            .controls {
+                @include flex-grow(1);
+                margin-left: $interiorMargin;
+                input[type="text"],
+                input[type="search"],
+                input[type="number"],
+                .select {
+                    height: $btnStdH;
+                    line-height: $btnStdH;
+                    vertical-align: middle;
+                }
+
+                .e-control {
+                    // Individual form controls
+                    &:not(:first-child) {
+                        margin-left: $interiorMarginSm;
+                    }
+                }
+            }
+
+            &.connects-to-previous {
+                padding-top: 0;
+            }
+
+            &.section-header {
+                margin-top: $interiorMarginLg;
+                border-top: 1px solid $colorFormLines;
+            }
+
+            &.controls-first {
+                .control {
+                    @include flex-grow(0);
+                    margin-right: $interiorMargin;
+                    min-width: 0;
+                    order: 1;
+                    width: auto;
+                }
+                label {
+                    @include flex-grow(1);
+                    order: 2;
+                    width: auto;
+                }
+            }
+            &.controls-under {
+                display: block;
+                .control, label {
+                    display: block;
+                    width: auto;
+                }
+
+                ul li {
+                    border-top: none !important;
+                    padding: 0;
+                }
+            }
+        }
+    }
+
+    .form-error {
+        // Block element that visually flags an error and contains a message
+        background-color: $colorFormFieldErrorBg;
+        color: $colorFormFieldErrorFg;
+        border-radius: $basicCr;
+        display: block;
+        padding: 1px 6px;
+        &:before {
+            content: $glyph-icon-alert-triangle;
+            display: inline;
+            font-family: symbolsfont;
+            margin-right: $interiorMarginSm;
+        }
+    }
+}

platform/commonUI/general/res/sass/overlay/_overlay.scss

@@ -79,6 +79,7 @@
 
     // Dialog boxes, size constrained and centered in desktop/tablet
     &.l-dialog {
+        font-size: 0.8rem;
         .s-button {
             &:not(.major) {
                 @include btnSubtle($bg: $colorOvrBtnBg, $bgHov: pullForward($colorOvrBtnBg, 10%), $fg: $colorOvrBtnFg, $fgHov: $colorOvrBtnFg, $ic: $colorOvrBtnFg, $icHov: $colorOvrBtnFg);
@@ -125,9 +126,9 @@
             @include containerSubtle($colorOvrBg, $colorOvrFg);
         }
 
-        .title {
+        .dialog-title {
             @include ellipsize();
-            font-size: 1.2em;
+            font-size: 1.5em;
             line-height: 120%;
             margin-bottom: $interiorMargin;
         }

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

@@ -52,21 +52,13 @@ ul.tree {
 
     .view-control {
         color: $colorItemTreeVC;
-        font-size: 0.75em;
         margin-right: $interiorMargin;
         height: 100%;
         line-height: inherit;
         width: $treeVCW;
+        &:before { display: none; }
         &.has-children {
-            &:before {
-                position: absolute;
-                @include trans-prop-nice(transform, 100ms);
-                content: "\e904";
-                @include transform-origin(center);
-            }
-            &.expanded:before {
-                @include transform(rotate(90deg));
-            }
+            &:before { display: block; }
         }
     }
 

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

@@ -44,7 +44,8 @@
 
     &.t-object-type-timer,
     &.t-object-type-clock,
-    &.t-object-type-hyperlink {
+    &.t-object-type-hyperlink,
+    &.t-object-type-summary-widget {
         // Hide the right side buttons for objects where they don't make sense
         // Note that this will hide the view Switcher button if applied
         // to an object that has it.
@@ -125,14 +126,21 @@
         pointer-events: none !important;
     }
 
-        /********************************************************** OBJECT TYPES */
-    .t-object-type-hyperlink {
+    /********************************************************** OBJECT TYPES */
+    .t-object-type-hyperlink,
+    .t-object-type-summary-widget {
         .object-holder {
             overflow: hidden;
         }
+        .w-summary-widget,
+        .l-summary-widget,
         .l-hyperlink.s-button {
-            // When a hyperlink is a button in a frame, make it expand to fill out to the object-holder
+            // Some object types expand to the full size of the object-holder.
             @extend .abs;
+        }
+
+        .l-summary-widget,
+        .l-hyperlink.s-button {
             .label {
                 @include ellipsize();
                 @include transform(translateY(-50%));

platform/commonUI/general/src/controllers/ObjectInspectorController.js

@@ -108,8 +108,11 @@ define(
 
                 getMetadata();
             });
-        }
 
+            var mutation = $scope.ngModel.selectedObject.getCapability('mutation');
+            var unlisten = mutation.listen(getMetadata);
+            $scope.$on('$destroy', unlisten);
+        }
         return ObjectInspectorController;
     }
 );

platform/commonUI/general/test/controllers/ObjectInspectorControllerSpec.js

@@ -39,10 +39,18 @@ define(
             beforeEach(function () {
                 mockScope = jasmine.createSpyObj(
                     "$scope",
-                    ["$watch"]
+                    ["$watch", "$on"]
                 );
                 mockScope.ngModel = {};
-                mockScope.ngModel.selectedObject = 'mock selected object';
+                mockScope.ngModel.selectedObject = {
+                    getCapability: function () {
+                        return {
+                            listen: function () {
+                                return true;
+                            }
+                        };
+                    }
+                };
 
                 mockObjectService = jasmine.createSpyObj(
                     "objectService",

platform/commonUI/themes/espresso/res/sass/_constants.scss

@@ -243,6 +243,12 @@ $colorCalCellSelectedBg: $colorItemTreeSelectedBg;
 $colorCalCellSelectedFg: $colorItemTreeSelectedFg;
 $colorCalCellInMonthBg: pushBack($colorMenuBg, 5%);
 
+// Palettes
+$colorPaletteFg: pullForward($colorMenuBg, 30%);
+$colorPaletteSelected: #fff;
+$shdwPaletteFg: black 0 0 2px;
+$shdwPaletteSelected: inset 0 0 0 1px #000;
+
 // About Screen
 $colorAboutLink: #84b3ff;
 

platform/commonUI/themes/snow/res/sass/_constants.scss

@@ -243,6 +243,12 @@ $colorCalCellSelectedBg: $colorItemTreeSelectedBg;
 $colorCalCellSelectedFg: $colorItemTreeSelectedFg;
 $colorCalCellInMonthBg: pullForward($colorMenuBg, 5%);
 
+// Palettes
+$colorPaletteFg: pullForward($colorMenuBg, 30%);
+$colorPaletteSelected: #333;
+$shdwPaletteFg: none;
+$shdwPaletteSelected: inset 0 0 0 1px #fff;
+
 // About Screen
 $colorAboutLink: #84b3ff;
 

platform/features/clock/bundle.js

@@ -23,10 +23,13 @@
 define([
     "moment-timezone",
     "./src/indicators/ClockIndicator",
+    "./src/indicators/FollowIndicator",
     "./src/services/TickerService",
+    "./src/services/TimerService",
     "./src/controllers/ClockController",
     "./src/controllers/TimerController",
     "./src/controllers/RefreshingController",
+    "./src/actions/FollowTimerAction",
     "./src/actions/StartTimerAction",
     "./src/actions/RestartTimerAction",
     "./src/actions/StopTimerAction",
@@ -37,10 +40,13 @@ define([
 ], function (
     MomentTimezone,
     ClockIndicator,
+    FollowIndicator,
     TickerService,
+    TimerService,
     ClockController,
     TimerController,
     RefreshingController,
+    FollowTimerAction,
     StartTimerAction,
     RestartTimerAction,
     StopTimerAction,
@@ -80,6 +86,11 @@ define([
                         "CLOCK_INDICATOR_FORMAT"
                     ],
                     "priority": "preferred"
+                },
+                {
+                    "implementation": FollowIndicator,
+                    "depends": ["timerService"],
+                    "priority": "fallback"
                 }
             ],
             "services": [
@@ -90,6 +101,11 @@ define([
                         "$timeout",
                         "now"
                     ]
+                },
+                {
+                    "key": "timerService",
+                    "implementation": TimerService,
+                    "depends": ["openmct"]
                 }
             ],
             "controllers": [
@@ -134,6 +150,15 @@ define([
                 }
             ],
             "actions": [
+                {
+                    "key": "timer.follow",
+                    "implementation": FollowTimerAction,
+                    "depends": ["timerService"],
+                    "category": "contextual",
+                    "name": "Follow Timer",
+                    "cssClass": "icon-clock",
+                    "priority": "optional"
+                },
                 {
                     "key": "timer.start",
                     "implementation": StartTimerAction,

platform/features/clock/src/actions/FollowTimerAction.js

@@ -0,0 +1,56 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2009-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.
+ *****************************************************************************/
+
+define(
+    [],
+    function () {
+
+        /**
+         * Designates a specific timer for following. Timelines, for example,
+         * use the actively followed timer to display a time-of-interest line
+         * and interpret time conductor bounds in the Timeline's relative
+         * time frame.
+         *
+         * @implements {Action}
+         * @memberof platform/features/clock
+         * @constructor
+         * @param {ActionContext} context the context for this action
+         */
+        function FollowTimerAction(timerService, context) {
+            var domainObject =
+                context.domainObject &&
+                context.domainObject.useCapability('adapter');
+            this.perform =
+                timerService.setTimer.bind(timerService, domainObject);
+        }
+
+        FollowTimerAction.appliesTo = function (context) {
+            var model =
+                (context.domainObject && context.domainObject.getModel()) ||
+                {};
+
+            return model.type === 'timer';
+        };
+
+        return FollowTimerAction;
+    }
+);

platform/features/clock/src/indicators/FollowIndicator.js

@@ -1,5 +1,5 @@
 /*****************************************************************************
- * Open MCT, Copyright (c) 2014-2017, United States Government
+ * Open MCT, Copyright (c) 2009-2016, United States Government
  * as represented by the Administrator of the National Aeronautics and Space
  * Administration. All rights reserved.
  *
@@ -20,26 +20,38 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-define([], function () {
-    function Region(element) {
-        this.activeView = undefined;
-        this.element = element;
+define(
+    ['moment'],
+    function (moment) {
+        var NO_TIMER = "No timer being followed";
+
+        /**
+         * Indicator that displays the active timer, as well as its
+         * current state.
+         * @implements {Indicator}
+         * @memberof platform/features/clock
+         */
+        function FollowIndicator(timerService) {
+            this.timerService = timerService;
+        }
+
+        FollowIndicator.prototype.getGlyphClass = function () {
+            return "";
+        };
+
+        FollowIndicator.prototype.getCssClass = function () {
+            return (this.timerService.getTimer()) ? "icon-timer s-status-ok" : "icon-timer";
+        };
+
+        FollowIndicator.prototype.getText = function () {
+            var timer = this.timerService.getTimer();
+            return (timer) ? 'Following timer ' + timer.getModel().name : NO_TIMER;
+        };
+
+        FollowIndicator.prototype.getDescription = function () {
+            return "";
+        };
+
+        return FollowIndicator;
     }
-
-    Region.prototype.clear = function () {
-        if (this.activeView) {
-            this.activeView.destroy();
-            this.activeView = undefined;
-        }
-    };
-
-    Region.prototype.show = function (view) {
-        this.clear();
-        this.activeView = view;
-        if (this.activeView) {
-            this.activeView.show(this.element);
-        }
-    };
-
-    return Region;
-});
+);

platform/features/clock/src/services/TimerService.js

@@ -0,0 +1,113 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2009-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.
+ *****************************************************************************/
+
+define(['EventEmitter'], function (EventEmitter) {
+
+    /**
+     * Tracks the currently-followed Timer object. Used by
+     * timelines et al to synchronize to a particular timer.
+     *
+     * The TimerService emits `change` events when the active timer
+     * is changed.
+     */
+    function TimerService(openmct) {
+        EventEmitter.apply(this);
+        this.time = openmct.time;
+        this.objects = openmct.objects;
+    }
+
+    TimerService.prototype = Object.create(EventEmitter.prototype);
+
+    /**
+     * Set (or clear, if `timer` is undefined) the currently active timer.
+     * @param {DomainObject} timer the new active timer
+     * @emits change
+     */
+    TimerService.prototype.setTimer = function (timer) {
+        this.timer = timer;
+        this.emit('change');
+
+        if (this.stopObserving) {
+            this.stopObserving();
+            delete this.stopObserving;
+        }
+
+        if (timer) {
+            this.stopObserving =
+                this.objects.observe(timer, '*', this.setTimer.bind(this));
+        }
+    };
+
+    /**
+     * Get the currently active timer.
+     * @return {DomainObject} the active timer
+     * @emits change
+     */
+    TimerService.prototype.getTimer = function () {
+        return this.timer;
+    };
+
+
+    /**
+     * Check if there is a currently active timer.
+     * @return {boolean} true if there is a timer
+     */
+    TimerService.prototype.hasTimer = function () {
+        return !!this.timer;
+    };
+
+    /**
+     * Convert the provided timestamp to milliseconds relative to
+     * the active timer.
+     * @return {number} milliseconds since timer start
+     */
+    TimerService.prototype.convert = function (timestamp) {
+        var clock = this.time.clock();
+        var canConvert = this.hasTimer() &&
+            !!clock &&
+            this.timer.timerState !== 'stopped';
+
+        if (!canConvert) {
+            return undefined;
+        }
+
+        var now = clock.currentValue();
+        var delta = this.timer.timerState === 'paused' ?
+            now - this.timer.pausedTime : 0;
+        var epoch = this.timer.timestamp;
+
+        return timestamp - epoch - delta;
+    };
+
+    /**
+     * Get the value of the active clock, adjusted to be relative to the active
+     * timer. If there is no clock or no active timer, this will return
+     * `undefined`.
+     * @return {number} milliseconds since the start of the active timer
+     */
+    TimerService.prototype.now = function () {
+        var clock = this.time.clock();
+        return clock && this.convert(clock.currentValue());
+    };
+
+    return TimerService;
+});

platform/features/clock/test/actions/FollowTimerActionSpec.js

@@ -0,0 +1,87 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2009-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.
+ *****************************************************************************/
+
+define([
+    "../../src/actions/FollowTimerAction"
+], function (FollowTimerAction) {
+    var TIMER_SERVICE_METHODS =
+        ['setTimer', 'getTimer', 'clearTimer', 'on', 'off'];
+
+    describe("The Follow Timer action", function () {
+        var testContext;
+        var testModel;
+        var testAdaptedObject;
+
+        beforeEach(function () {
+            testModel = {};
+            testContext = { domainObject: jasmine.createSpyObj('domainObject', [
+                'getModel',
+                'useCapability'
+            ]) };
+            testAdaptedObject = { foo: 'bar' };
+            testContext.domainObject.getModel.andReturn(testModel);
+            testContext.domainObject.useCapability.andCallFake(function (c) {
+                return c === 'adapter' && testAdaptedObject;
+            });
+        });
+
+        it("is applicable to timers", function () {
+            testModel.type = "timer";
+            expect(FollowTimerAction.appliesTo(testContext)).toBe(true);
+        });
+
+        it("is inapplicable to non-timers", function () {
+            testModel.type = "folder";
+            expect(FollowTimerAction.appliesTo(testContext)).toBe(false);
+        });
+
+        describe("when instantiated", function () {
+            var mockTimerService;
+            var action;
+
+            beforeEach(function () {
+                mockTimerService = jasmine.createSpyObj(
+                    'timerService',
+                    TIMER_SERVICE_METHODS
+                );
+                action = new FollowTimerAction(mockTimerService, testContext);
+            });
+
+            it("does not interact with the timer service", function () {
+                TIMER_SERVICE_METHODS.forEach(function (method) {
+                    expect(mockTimerService[method]).not.toHaveBeenCalled();
+                });
+            });
+
+            describe("and performed", function () {
+                beforeEach(function () {
+                    action.perform();
+                });
+
+                it("sets the active timer", function () {
+                    expect(mockTimerService.setTimer)
+                        .toHaveBeenCalledWith(testAdaptedObject);
+                });
+            });
+        });
+    });
+});

platform/features/clock/test/indicators/FollowIndicatorSpec.js

@@ -0,0 +1,61 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2009-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.
+ *****************************************************************************/
+
+define(["../../src/indicators/FollowIndicator"], function (FollowIndicator) {
+    var TIMER_SERVICE_METHODS =
+        ['setTimer', 'getTimer', 'clearTimer', 'on', 'off'];
+
+    describe("The timer-following indicator", function () {
+        var mockTimerService;
+        var indicator;
+
+        beforeEach(function () {
+            mockTimerService =
+                jasmine.createSpyObj('timerService', TIMER_SERVICE_METHODS);
+            indicator = new FollowIndicator(mockTimerService);
+        });
+
+        it("implements the Indicator interface", function () {
+            expect(indicator.getGlyphClass()).toEqual(jasmine.any(String));
+            expect(indicator.getCssClass()).toEqual(jasmine.any(String));
+            expect(indicator.getText()).toEqual(jasmine.any(String));
+            expect(indicator.getDescription()).toEqual(jasmine.any(String));
+        });
+
+        describe("when a timer is set", function () {
+            var testModel;
+            var mockDomainObject;
+
+            beforeEach(function () {
+                testModel = { name: "some timer!" };
+                mockDomainObject = jasmine.createSpyObj('timer', ['getModel']);
+                mockDomainObject.getModel.andReturn(testModel);
+                mockTimerService.getTimer.andReturn(mockDomainObject);
+            });
+
+            it("displays the timer's name", function () {
+                expect(indicator.getText().indexOf(testModel.name))
+                    .not.toEqual(-1);
+            });
+        });
+    });
+});

platform/features/clock/test/services/TimerServiceSpec.js

@@ -0,0 +1,77 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2009-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.
+ *****************************************************************************/
+
+define([
+    '../../src/services/TimerService'
+], function (TimerService) {
+    describe("TimerService", function () {
+        var callback;
+        var mockmct;
+        var timerService;
+
+        beforeEach(function () {
+            callback = jasmine.createSpy('callback');
+            mockmct = {
+                time: { clock: jasmine.createSpy('clock') },
+                objects: { observe: jasmine.createSpy('observe') }
+            };
+            timerService = new TimerService(mockmct);
+            timerService.on('change', callback);
+        });
+
+        it("initially emits no change events", function () {
+            expect(callback).not.toHaveBeenCalled();
+        });
+
+        it("reports no current timer", function () {
+            expect(timerService.getTimer()).toBeUndefined();
+        });
+
+        describe("setTimer", function () {
+            var testTimer;
+
+            beforeEach(function () {
+                testTimer = { name: "I am some timer; you are nobody." };
+                timerService.setTimer(testTimer);
+            });
+
+            it("emits a change event", function () {
+                expect(callback).toHaveBeenCalled();
+            });
+
+            it("reports the current timer", function () {
+                expect(timerService.getTimer()).toBe(testTimer);
+            });
+
+            it("observes changes to an object", function () {
+                var newTimer = { name: "I am another timer." };
+                expect(mockmct.objects.observe).toHaveBeenCalledWith(
+                    testTimer,
+                    '*',
+                    jasmine.any(Function)
+                );
+                mockmct.objects.observe.mostRecentCall.args[2](newTimer);
+                expect(timerService.getTimer()).toBe(newTimer);
+            });
+        });
+    });
+});

platform/features/imagery/src/controllers/ImageryController.js

@@ -255,6 +255,8 @@ define(
                 if (this.nextDatum) {
                     this.updateValues(this.nextDatum);
                     delete this.nextDatum;
+                } else {
+                    this.updateValues(this.$scope.imageHistory[this.$scope.imageHistory.length - 1]);
                 }
                 this.autoScroll = true;
             }

platform/features/imagery/test/controllers/ImageryControllerSpec.js

@@ -183,6 +183,17 @@ define(
                     expect(controller.getImageUrl()).toEqual(newUrl);
                 });
 
+                it("forwards large image view to latest image in history on un-pause", function () {
+                    $scope.imageHistory = [
+                        { utc: 1434600258122, url: 'some/url1', selected: false},
+                        { utc: 1434600258123, url: 'some/url2', selected: false}
+                    ];
+                    controller.paused(true);
+                    controller.paused(false);
+
+                    expect(controller.getImageUrl()).toEqual(controller.getImageUrl($scope.imageHistory[1]));
+                });
+
                 it("subscribes to telemetry", function () {
                     expect(openmct.telemetry.subscribe).toHaveBeenCalledWith(
                         newDomainObject,
@@ -227,7 +238,7 @@ define(
                     expect(controller.updateHistory(mockDatum)).toBe(false);
                 });
 
-                describe("user clicks on imagery thumbnail", function () {
+                describe("when user clicks on imagery thumbnail", function () {
                     var mockDatum = { utc: 1434600258123, url: 'some/url', selected: false};
 
                     it("pauses and adds selected class to imagery thumbnail", function () {
@@ -248,6 +259,7 @@ define(
                         expect(controller.getTime()).toEqual(controller.timeFormat.format(mockDatum.utc));
                     });
                 });
+
             });
 
             it("initially shows an empty string for date/time", function () {

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

@@ -19,7 +19,7 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<div class="frame frame-template t-frame-inner abs t-object-type-{{ representation.selected.key }}">
+<div class="frame frame-template t-frame-inner abs t-object-type-{{ domainObject.getModel().type }}">
     <div class="abs object-browse-bar l-flex-row">
         <div class="left flex-elem l-flex-row grows">
             <mct-representation

platform/features/layout/src/FixedController.js

@@ -360,22 +360,47 @@ define(
          */
         FixedController.prototype.updateView = function (telemetryObject, datum) {
             var metadata = this.openmct.telemetry.getMetadata(telemetryObject);
-            var rangeMetadata = metadata.valuesForHints(['range'])[0];
-            var rangeKey = rangeMetadata.source || rangeMetadata.key;
-            var valueMetadata = metadata.value(rangeKey);
+            var telemetryKeyToDisplay = this.chooseTelemetryKeyToDisplay(metadata);
+            var formattedTelemetryValue = this.getFormattedTelemetryValueForKey(telemetryKeyToDisplay, datum, metadata);
             var limitEvaluator = this.openmct.telemetry.limitEvaluator(telemetryObject);
-            var formatter = this.openmct.telemetry.getValueFormatter(valueMetadata);
-            var value = datum[valueMetadata.key];
-            var alarm = limitEvaluator && limitEvaluator.evaluate(datum, rangeKey);
+            var alarm = limitEvaluator && limitEvaluator.evaluate(datum, telemetryKeyToDisplay);
 
             this.setDisplayedValue(
                 telemetryObject,
-                formatter.format(value),
+                formattedTelemetryValue,
                 alarm && alarm.cssClass
             );
             this.digest();
         };
 
+        /**
+         * @private
+         */
+        FixedController.prototype.getFormattedTelemetryValueForKey = function (telemetryKeyToDisplay, datum, metadata) {
+            var valueMetadata = metadata.value(telemetryKeyToDisplay);
+            var formatter = this.openmct.telemetry.getValueFormatter(valueMetadata);
+
+            return formatter.format(datum[valueMetadata.key]);
+        };
+
+        /**
+         * @private
+         */
+        FixedController.prototype.chooseTelemetryKeyToDisplay = function (metadata) {
+            // If there is a range value, show that preferentially
+            var telemetryKeyToDisplay = metadata.valuesForHints(['range'])[0];
+
+            // If no range is defined, default to the highest priority non time-domain data.
+            if (telemetryKeyToDisplay === undefined) {
+                var valuesOrderedByPriority = metadata.values();
+                telemetryKeyToDisplay = valuesOrderedByPriority.filter(function (valueMetadata) {
+                    return !(valueMetadata.hints.domain);
+                })[0];
+            }
+
+            return telemetryKeyToDisplay.source;
+        };
+
         /**
          * Request the last historical data point for the given domain objects
          * @param {object[]} objects
@@ -388,7 +413,9 @@ define(
             objects.forEach(function (object) {
                 self.openmct.telemetry.request(object, {start: bounds.start, end: bounds.end, size: 1})
                     .then(function (data) {
-                        self.updateView(object, data[data.length - 1]);
+                        if (data.length > 0) {
+                            self.updateView(object, data[data.length - 1]);
+                        }
                     });
             });
             return objects;

platform/features/layout/src/LayoutController.js

@@ -26,8 +26,12 @@
  * @namespace platform/features/layout
  */
 define(
-    ['./LayoutDrag'],
-    function (LayoutDrag) {
+    [
+        './LayoutDrag'
+    ],
+    function (
+        LayoutDrag
+    ) {
 
         var DEFAULT_DIMENSIONS = [12, 8],
             DEFAULT_GRID_SIZE = [32, 32],
@@ -123,6 +127,8 @@ define(
                         if (self.droppedIdToSelectAfterRefresh) {
                             self.select(null, self.droppedIdToSelectAfterRefresh);
                             delete self.droppedIdToSelectAfterRefresh;
+                        } else if (composition.indexOf(self.selectedId) === -1) {
+                            self.clearSelection();
                         }
                     }
                 });

platform/features/layout/test/FixedControllerSpec.js

@@ -178,7 +178,6 @@ define(
                     Promise.resolve(mockChildren)
                 );
 
-
                 mockScope.model = testModel;
                 mockScope.configuration = testConfiguration;
                 mockScope.selection = jasmine.createSpyObj(
@@ -194,7 +193,8 @@ define(
 
                 mockMetadata = jasmine.createSpyObj('mockMetadata', [
                     'valuesForHints',
-                    'value'
+                    'value',
+                    'values'
                 ]);
                 mockMetadata.value.andReturn({
                     key: 'value'
@@ -653,6 +653,39 @@ define(
                     });
                 });
 
+                it("selects an range value to display, if available", function () {
+                    mockMetadata.valuesForHints.andReturn([
+                        {
+                            key: 'range',
+                            source: 'range'
+                        }
+                    ]);
+                    var key = controller.chooseTelemetryKeyToDisplay(mockMetadata);
+                    expect(key).toEqual('range');
+                });
+
+                it("selects the first non-domain value to display, if no range available", function () {
+                    mockMetadata.valuesForHints.andReturn([]);
+                    mockMetadata.values.andReturn([
+                        {
+                            key: 'domain',
+                            source: 'domain',
+                            hints: {
+                                domain: 1
+                            }
+                        },
+                        {
+                            key: 'image',
+                            source: 'image',
+                            hints: {
+                                image: 1
+                            }
+                        }
+                    ]);
+                    var key = controller.chooseTelemetryKeyToDisplay(mockMetadata);
+                    expect(key).toEqual('image');
+                });
+
                 it("reflects limit status", function () {
                     mockLimitEvaluator.evaluate.andReturn({cssClass: "alarm-a"});
                     controller.updateView(mockTelemetryObject, [{

platform/features/layout/test/LayoutControllerSpec.js

@@ -424,6 +424,17 @@ define(
                 expect(selectedObj.showFrame).toEqual(jasmine.any(Function));
             });
 
+            it("deselects the object that is no longer in the composition", function () {
+                mockScope.$watchCollection.mostRecentCall.args[1]();
+                var childObj = mockCompositionObjects[0];
+                controller.select(mockEvent, childObj.getId());
+
+                var composition = ["b", "c"];
+                mockScope.$watchCollection.mostRecentCall.args[1](composition);
+
+                expect(controller.selected(childObj)).toBe(false);
+            });
+
         });
     }
 );

platform/features/listview/bundle.js

@@ -49,7 +49,7 @@
                 {
                     "key": "ListViewController",
                     "implementation": ListViewController,
-                    "depends": ["$scope"]
+                    "depends": ["$scope", "formatService"]
                 }
             ],
             "directives": [

platform/features/listview/src/controllers/ListViewController.js

@@ -21,7 +21,7 @@
  *****************************************************************************/
 
 define(function () {
-    function ListViewController($scope) {
+    function ListViewController($scope, formatService) {
         this.$scope = $scope;
         $scope.orderByField = 'title';
         $scope.reverseSort = false;
@@ -30,6 +30,8 @@ define(function () {
         var unlisten = $scope.domainObject.getCapability('mutation')
             .listen(this.updateView.bind(this));
 
+        this.utc = formatService.getFormat('utc');
+
         $scope.$on('$destroy', function () {
             unlisten();
         });
@@ -50,17 +52,13 @@ define(function () {
                 icon: child.getCapability('type').getCssClass(),
                 title: child.getModel().name,
                 type: child.getCapability('type').getName(),
-                persisted: new Date(
-                    child.getModel().persisted
-                ).toUTCString(),
-                modified: new Date(
-                    child.getModel().modified
-                ).toUTCString(),
+                persisted: this.utc.format(child.getModel().persisted),
+                modified: this.utc.format(child.getModel().modified),
                 asDomainObject: child,
                 location: child.getCapability('location'),
                 action: child.getCapability('action')
             };
-        });
+        }, this);
     };
 
     return ListViewController;

platform/features/listview/test/controllers/ListViewControllerSpec.js

@@ -31,7 +31,9 @@ define(
                 controller,
                 childModel,
                 typeCapability,
-                mutationCapability;
+                mutationCapability,
+                formatService;
+
             beforeEach(function () {
                 unlistenFunc = jasmine.createSpy("unlisten");
 
@@ -41,6 +43,18 @@ define(
                 );
                 mutationCapability.listen.andReturn(unlistenFunc);
 
+                formatService = jasmine.createSpyObj(
+                    "formatService",
+                    ["getFormat"]
+                );
+                formatService.getFormat.andReturn(jasmine.createSpyObj(
+                    'utc',
+                    ["format"]
+                ));
+                formatService.getFormat().format.andCallFake(function (v) {
+                    return "formatted " + v;
+                });
+
                 typeCapability = jasmine.createSpyObj(
                     "typeCapability",
                     ["getCssClass", "getName"]
@@ -94,20 +108,27 @@ define(
                 );
                 scope.domainObject = domainObject;
 
-                controller  = new ListViewController(scope);
+                controller  = new ListViewController(scope, formatService);
 
                 waitsFor(function () {
                     return scope.children;
                 });
             });
+
+            it("uses the UTC time format", function () {
+                expect(formatService.getFormat).toHaveBeenCalledWith('utc');
+            });
+
             it("updates the view", function () {
                 expect(scope.children[0]).toEqual(
                     {
                         icon: "icon-folder",
                         title: "Battery Charge Status",
                         type: "Folder",
-                        persisted: "Wed, 07 Jun 2017 20:34:57 GMT",
-                        modified: "Wed, 07 Jun 2017 20:34:57 GMT",
+                        persisted: formatService.getFormat('utc')
+                            .format(childModel.persisted),
+                        modified: formatService.getFormat('utc')
+                            .format(childModel.modified),
                         asDomainObject: childObject,
                         location: ''
                     }

platform/features/table/src/controllers/TelemetryTableController.js

@@ -170,6 +170,9 @@ define(
          * @param rows
          */
         TelemetryTableController.prototype.addRowsToTable = function (rows) {
+            rows.forEach(function (row) {
+                this.$scope.rows.push(row);
+            }, this);
             this.$scope.$broadcast('add:rows', rows);
         };
 

platform/features/table/test/controllers/TelemetryTableControllerSpec.js

@@ -436,5 +436,28 @@ define(
                 expect(mockScope.$broadcast).toHaveBeenCalledWith("remove:rows", discardedRows);
             });
 
+            describe('when telemetry is added', function () {
+                var testRows;
+                var expectedRows;
+
+                beforeEach(function () {
+                    testRows = [{ a: 0 }, { a: 1 }, { a: 2 }];
+                    mockScope.rows = [{ a: -1 }];
+                    expectedRows = mockScope.rows.concat(testRows);
+
+                    spyOn(controller.telemetry, "on").andCallThrough();
+                    controller.registerChangeListeners();
+
+                    controller.telemetry.on.calls.forEach(function (call) {
+                        if (call.args[0] === 'added') {
+                            call.args[1](testRows);
+                        }
+                    });
+                });
+
+                it("adds it to rows in scope", function () {
+                    expect(mockScope.rows).toEqual(expectedRows);
+                });
+            });
         });
     });

platform/features/timeline/bundle.js

@@ -29,6 +29,7 @@ define([
     "./src/controllers/TimelineTickController",
     "./src/controllers/TimelineTableController",
     "./src/controllers/TimelineGanttController",
+    "./src/controllers/TimelineTOIController",
     "./src/controllers/ActivityModeValuesController",
     "./src/capabilities/ActivityTimespanCapability",
     "./src/capabilities/TimelineTimespanCapability",
@@ -37,6 +38,7 @@ define([
     "./src/capabilities/CostCapability",
     "./src/directives/MCTSwimlaneDrop",
     "./src/directives/MCTSwimlaneDrag",
+    "./src/directives/MCTResourceGraphDrop",
     "./src/services/ObjectLoader",
     "./src/chart/MCTTimelineChart",
     "text!./res/templates/values.html",
@@ -59,6 +61,7 @@ define([
     TimelineTickController,
     TimelineTableController,
     TimelineGanttController,
+    TimelineTOIController,
     ActivityModeValuesController,
     ActivityTimespanCapability,
     TimelineTimespanCapability,
@@ -67,6 +70,7 @@ define([
     CostCapability,
     MCTSwimlaneDrop,
     MCTSwimlaneDrag,
+    MCTResourceGraphDrop,
     ObjectLoader,
     MCTTimelineChart,
     valuesTemplate,
@@ -502,6 +506,15 @@ define([
                         "TIMELINE_MAXIMUM_OFFSCREEN"
                     ]
                 },
+                {
+                    "key": "TimelineTOIController",
+                    "implementation": TimelineTOIController,
+                    "depends": [
+                        "openmct",
+                        "timerService",
+                        "$scope"
+                    ]
+                },
                 {
                     "key": "ActivityModeValuesController",
                     "implementation": ActivityModeValuesController,
@@ -566,6 +579,13 @@ define([
                         "$interval",
                         "$log"
                     ]
+                },
+                {
+                    "key": "mctResourceGraphDrop",
+                    "implementation": MCTResourceGraphDrop,
+                    "depends": [
+                        "dndService"
+                    ]
                 }
             ],
             "services": [

platform/features/timeline/res/sass/_timeline-thematic.scss

@@ -29,6 +29,44 @@
             }
         }
     }
+
+    // Follow Line
+    .l-follow-line {
+        // TODO: move before and after into l-timeline-gantt so those only render in that pane
+        pointer-events: none;
+        position: absolute;
+        top: 0; bottom: 0;
+        width: 1px;
+        z-index: 9; // Just below .l-hover-btns-holder
+    }
+}
+
+.l-timeline-gantt {
+    .l-follow-line {
+        $d: 0.8rem;
+        top: $interiorMargin;
+        &:before,
+        &:after {
+            content: '';
+            display: block;
+            height: $d;
+            width: $d;
+            position: absolute;
+            top: 0;
+            @include transform(translateX(-50%));
+        }
+        &:before {
+            // Icon blocker
+            width: 2 * $d;
+        }
+        &:after {
+            // Icon
+            font-size: $d;
+            line-height: $d;
+            text-align: center;
+        }
+    }
+
 }
 
 .s-timeline-gantt {
@@ -108,10 +146,9 @@
     }
     .s-hover-btns-holder {
         $bg: $timelineHeaderColorBg;
-        $bga: 1;
         $l: 5%;
         @include user-select(none);
-        @include background-image(linear-gradient(-90deg, rgba($bg, $bga), rgba($bg, $bga) 70%, rgba($bg, 0) 100%));
+        @include background-image(linear-gradient(-90deg, rgba($bg, 1), rgba($bg, 1) 70%, rgba($bg, 0) 100%));
         .s-button {
             height: 16px;
             line-height: 16px;
@@ -129,4 +166,27 @@
             color: $timelineResourceGraphFg;
         }
     }
+
+    .s-follow-line {
+        background: rgba($timeControllerToiLineColor, 0.5);
+    }
+
+    .s-timeline-gantt {
+        .s-follow-line {
+            &:after {
+                // Icon
+                color: $timeControllerToiLineColor;
+                content: $glyph-icon-timer;
+                font-family: symbolsfont;
+                text-shadow: $shdwItemText;
+            }
+            &:before {
+                // Blocker
+                $bg: $timelineHeaderColorBg;
+                $l: 30%;
+                @include background-image(linear-gradient(90deg, rgba($bg, 0), rgba($bg, 1) $l, rgba($bg, 1) 100% - $l, rgba($bg, 0)));
+
+            }
+        }
+    }
 }

platform/features/timeline/res/sass/_timelines.scss

@@ -38,6 +38,10 @@
     .l-timeline-pane {
         @include absPosDefault();
 
+		&.drop-over {
+			background-color: lighten($colorEditAreaBg, 5%);
+		}
+
 	    .l-width-control {
 		    position: relative;
 	    }
@@ -75,6 +79,10 @@
                 }
             }
             &.l-timeline-gantt {
+                .abs.l-timeline-gantt-header-w {
+                    overflow: hidden;
+                    height: $timelineTopPaneHeaderH;
+                }
                 .l-swimlanes-holder {
                     @include scrollV(scroll);
                     bottom: $scrollbarTrackSize;

platform/features/timeline/res/sass/timeline-espresso.scss

@@ -24,6 +24,7 @@ $output-bourbon-deprecation-warnings: false;
 
 @import "../../../../commonUI/general/res/sass/constants";
 @import "../../../../commonUI/general/res/sass/mixins";
+@import "../../../../commonUI/general/res/sass/glyphs";
 @import "../../../../commonUI/themes/espresso/res/sass/constants";
 @import "../../../../commonUI/themes/espresso/res/sass/mixins";
 @import "constants";

platform/features/timeline/res/sass/timeline-snow.scss

@@ -24,6 +24,7 @@ $output-bourbon-deprecation-warnings: false;
 
 @import "../../../../commonUI/general/res/sass/constants";
 @import "../../../../commonUI/general/res/sass/mixins";
+@import "../../../../commonUI/general/res/sass/glyphs";
 @import "../../../../commonUI/themes/snow/res/sass/constants";
 @import "../../../../commonUI/themes/snow/res/sass/mixins";
 @import "constants";

platform/features/timeline/res/sass/timeline.scss

@@ -24,6 +24,7 @@ $output-bourbon-deprecation-warnings: false;
 
 @import "../../../../commonUI/general/res/sass/constants";
 @import "../../../../commonUI/general/res/sass/mixins";
+@import "../../../../commonUI/general/res/sass/glyphs";
 @import "../../../../commonUI/themes/espresso/res/sass/constants";
 @import "../../../../commonUI/themes/espresso/res/sass/mixins";
 @import "constants";

platform/features/timeline/res/templates/timeline.html

@@ -77,7 +77,8 @@
         <mct-splitter></mct-splitter>
 
         <!-- BOTTOM PANE RESOURCE LEGEND -->
-        <div class="split-pane-component abs l-timeline-pane t-pane-h l-pane-btm s-timeline-resource-legend l-timeline-resource-legend">
+        <div mct-resource-graph-drop
+             class="split-pane-component abs l-timeline-pane t-pane-h l-pane-btm s-timeline-resource-legend l-timeline-resource-legend">
             <div class="l-title s-title">{{ngModel.title}}Resource Graph Legend</div>
             <div class="l-legend-items legend">
                 <mct-include key="'timeline-legend-item'"
@@ -96,109 +97,124 @@
 
     <!-- RIGHT PANE: GANTT AND RESOURCE PLOTS -->
     <span ng-controller="TimelineZoomController as zoomController" class="abs">
-    <mct-split-pane anchor="bottom"
+
+        <span class="toi-control-holder temp" ng-controller="TimelineTOIController as toiController">
+            <mct-split-pane anchor="bottom"
                     position="pane.y"
                     class="abs split-pane-component l-timeline-pane l-pane-r t-pane-v">
 
-        <!-- TOP PANE GANTT BARS -->
-        <div class="split-pane-component l-timeline-pane t-pane-h l-pane-top t-timeline-gantt l-timeline-gantt s-timeline-gantt">
-            <div class="l-hover-btns-holder s-hover-btns-holder">
-                <a class="s-button icon-arrows-out"
-                   ng-click="zoomController.fit()"
-                   ng-show="true"
-                   title="Zoom to fit">
-                </a>
+                <!-- TOP PANE GANTT BARS -->
+                <div class="split-pane-component l-timeline-pane t-pane-h l-pane-top t-timeline-gantt l-timeline-gantt s-timeline-gantt">
+                    <div class="l-hover-btns-holder s-hover-btns-holder">
+                        <a class="s-button icon-timer"
+                           ng-click="scroll.follow = true"
+                           ng-show="!toiController.isFollowing() && toiController.isActive()"
+                           title="Follow time bounds">
+                        </a>
 
-                <a class="s-button icon-magnify-in"
-                   ng-click="zoomController.zoom(-1)"
-                   ng-show="true"
-                   title="Zoom in">
-                </a>
+                        <a class="s-button icon-arrows-out"
+                           ng-click="scroll.follow = false; zoomController.fit()"
+                           ng-show="true"
+                           title="Zoom to fit">
+                        </a>
 
-                <a class="s-button icon-magnify-out"
-                   ng-click="zoomController.zoom(1)"
-                   ng-show="true"
-                   title="Zoom out">
-                </a>
-            </div>
+                        <a class="s-button icon-magnify-in"
+                           ng-click="scroll.follow = false; zoomController.zoom(-1)"
+                           ng-show="true"
+                           title="Zoom in">
+                        </a>
 
-            <div style="overflow: hidden; position: absolute; left: 0; top: 0; right: 0; height: 30px;" mct-scroll-x="scroll.x">
-                <mct-include key="'timeline-ticks'"
-                             parameters="{
-                                         fullWidth: zoomController.width(timelineController.end()),
-                                         start: scroll.x,
-                                         width: scroll.width,
-                                         step: zoomController.toPixels(zoomController.zoom()),
-                                         toMillis: zoomController.toMillis
-                                         }">
-                </mct-include>
-            </div>
+                        <a class="s-button icon-magnify-out"
+                           ng-click="scroll.follow = false; zoomController.zoom(1)"
+                           ng-show="true"
+                           title="Zoom out">
+                        </a>
+                    </div>
 
-            <div class="t-swimlanes-holder l-swimlanes-holder"
-                 mct-scroll-x="scroll.x"
-                 mct-scroll-y="scroll.y">
-                <div class="l-width-control"
-                     ng-style="{ width: zoomController.width(timelineController.end()) + 'px' }">
-                    <div class="t-swimlane s-swimlane l-swimlane"
-                         ng-repeat="swimlane in timelineController.swimlanes()"
-                         ng-class="{
-                                   exceeded: swimlane.exceeded(),
-                                   selected: selection.selected(swimlane),
-                                   'drop-into': swimlane.highlight(),
-                                   'drop-after': swimlane.highlightBottom()
-                                   }"
-                         ng-click="selection.select(swimlane)"
-                         mct-swimlane-drop="swimlane">
+                    <div style="overflow: hidden; position: absolute; left: 0; top: 0; right: 0; height: 30px;" mct-scroll-x="scroll.x">
+                        <mct-include key="'timeline-ticks'"
+                                     parameters="{
+                                                 fullWidth: zoomController.width(timelineController.end()),
+                                                 start: scroll.x,
+                                                 width: scroll.width,
+                                                 step: zoomController.toPixels(zoomController.zoom()),
+                                                 toMillis: zoomController.toMillis
+                                                 }">
+                        </mct-include>
+                    </div>
+                    <div ng-if="toiController.isActive()" class="l-follow-line s-follow-line"
+                         ng-style="{ left: toiController.x() - scroll.x + 'px' }"></div>
 
-                        <mct-representation key="'gantt'"
-                                            mct-object="swimlane.domainObject"
-                                            parameters="{
-                                                        scroll: scroll,
-                                                        toPixels: zoomController.toPixels
-                                                        }">
-                        </mct-representation>
+                    <div class="t-swimlanes-holder l-swimlanes-holder"
+                         mct-scroll-x="scroll.x"
+                         mct-scroll-y="scroll.y">
+                        <div class="l-width-control"
+                             ng-style="{ width: zoomController.width(timelineController.end()) + 'px' }">
+                            <div class="t-swimlane s-swimlane l-swimlane"
+                                 ng-repeat="swimlane in timelineController.swimlanes()"
+                                 ng-class="{
+                                           exceeded: swimlane.exceeded(),
+                                           selected: selection.selected(swimlane),
+                                           'drop-into': swimlane.highlight(),
+                                           'drop-after': swimlane.highlightBottom()
+                                           }"
+                                 ng-click="selection.select(swimlane)"
+                                 mct-swimlane-drop="swimlane">
 
-                        <span ng-if="selection.selected(swimlane)">
-                            <span ng-repeat="handle in timelineController.handles()"
-                                  ng-style="handle.style(zoomController)"
-                                  style="position: absolute; top: 0px; bottom: 0px;"
-                                  class="handle"
-                                  ng-class="{ start: $index === 0, mid: $index === 1, end: $index > 1 }"
-                                  mct-drag-down="handle.begin()"
-                                  mct-drag="handle.drag(delta[0], zoomController); timelineController.refresh()"
-                                  mct-drag-up="handle.finish()">
-                            </span>
-                        </span>
+                                <mct-representation key="'gantt'"
+                                                    mct-object="swimlane.domainObject"
+                                                    parameters="{
+                                                                scroll: scroll,
+                                                                toPixels: zoomController.toPixels
+                                                                }">
+                                </mct-representation>
+
+                                <span ng-if="selection.selected(swimlane)">
+                                    <span ng-repeat="handle in timelineController.handles()"
+                                          ng-style="handle.style(zoomController)"
+                                          style="position: absolute; top: 0px; bottom: 0px;"
+                                          class="handle"
+                                          ng-class="{ start: $index === 0, mid: $index === 1, end: $index > 1 }"
+                                          mct-drag-down="handle.begin()"
+                                          mct-drag="handle.drag(delta[0], zoomController); timelineController.refresh()"
+                                          mct-drag-up="handle.finish()">
+                                    </span>
+                                </span>
+                            </div>
+                        </div>
                     </div>
                 </div>
-            </div>
-        </div>
 
-        <!-- HORZ SPLITTER -->
-        <mct-splitter></mct-splitter>
+                <!-- HORZ SPLITTER -->
+                <mct-splitter></mct-splitter>
 
-        <!-- BOTTOM PANE RESOURCE GRAPHS AND RIGHT PANE HORIZONTAL SCROLL CONTROL -->
-        <div class="split-pane-component l-timeline-resource-graph l-timeline-pane t-pane-h l-pane-btm">
-            <div class="l-graphs-holder"
-                 mct-resize="scroll.width = bounds.width">
-                <div class="t-graphs l-graphs">
-                    <mct-include key="'timeline-resource-graphs'"
-                                 parameters="{
-                                             origin: zoomController.toMillis(scroll.x),
-                                             duration: zoomController.toMillis(scroll.width),
-                                             graphs: timelineController.graphs()
-                                             }">
-                    </mct-include>
+                <!-- BOTTOM PANE RESOURCE GRAPHS AND RIGHT PANE HORIZONTAL SCROLL CONTROL -->
+                <div class="split-pane-component l-timeline-resource-graph l-timeline-pane t-pane-h l-pane-btm">
+                    <div class="l-graphs-holder"
+                         mct-resize="scroll.width = bounds.width">
+                        <div class="t-graphs l-graphs">
+                            <mct-include key="'timeline-resource-graphs'"
+                                         parameters="{
+                                                     origin: zoomController.toMillis(scroll.x),
+                                                     duration: zoomController.toMillis(scroll.width),
+                                                     graphs: timelineController.graphs()
+                                                     }">
+                            </mct-include>
+                        </div>
+                        <div ng-if="toiController.isActive()" class="l-follow-line s-follow-line"
+                             ng-style="{ left: toiController.x() - scroll.x + 'px' }"></div>
+                    </div>
+                    <div mct-scroll-x="scroll.x"
+                         class="t-pane-r-scroll-h-control l-scroll-control s-scroll-control">
+                        <div class="l-width-control"
+                             ng-style="{ width: zoomController.width(timelineController.end()) + 'px' }">
+                        </div>
+                    </div>
                 </div>
-            </div>
-            <div mct-scroll-x="scroll.x"
-                 class="t-pane-r-scroll-h-control l-scroll-control s-scroll-control">
-                <div class="l-width-control"
-                     ng-style="{ width: zoomController.width(timelineController.end()) + 'px' }">
-                </div>
-            </div>
-        </div>
-    </mct-split-pane>
+            </mct-split-pane>
+        </span>
+
+
     </span>
 </mct-split-pane>
 </div>

platform/features/timeline/src/controllers/TimelineTOIController.js

@@ -0,0 +1,111 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2009-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.
+ *****************************************************************************/
+
+define([], function () {
+
+    /**
+     * Tracks time-of-interest in timelines, updating both scroll state
+     * (when appropriate) and positioning of the displayed line.
+     */
+    function TimelineTOIController(openmct, timerService, $scope) {
+        this.openmct = openmct;
+        this.timerService = timerService;
+        this.$scope = $scope;
+
+        this.change = this.change.bind(this);
+        this.bounds = this.bounds.bind(this);
+        this.destroy = this.destroy.bind(this);
+
+        this.timerService.on('change', this.change);
+        this.openmct.time.on('bounds', this.bounds);
+
+        this.$scope.$on('$destroy', this.destroy);
+
+        this.$scope.scroll.follow = this.timerService.hasTimer();
+        if (this.$scope.zoomController) {
+            this.bounds(this.openmct.time.bounds());
+        }
+    }
+
+
+    /**
+     * Handle a `change` event from the timer service; track the
+     * new timer.
+     */
+    TimelineTOIController.prototype.change = function () {
+        this.$scope.scroll.follow =
+            this.$scope.scroll.follow || this.timerService.hasTimer();
+    };
+
+    /**
+     * Handle a `bounds` event from the time API; scroll the timeline
+     * to match the current bounds, if currently in follow mode.
+     */
+    TimelineTOIController.prototype.bounds = function (bounds) {
+        if (this.isFollowing()) {
+            var start = this.timerService.convert(bounds.start);
+            var end = this.timerService.convert(bounds.end);
+            this.duration = bounds.end - bounds.start;
+            this.$scope.zoomController.bounds(start, end);
+        }
+    };
+
+    /**
+     * Handle a `$destroy` event from scope; detach all observers.
+     */
+    TimelineTOIController.prototype.destroy = function () {
+        this.timerService.off('change', this.change);
+        this.openmct.time.off('bounds', this.bounds);
+    };
+
+    /**
+     * Get the x position of the time-of-interest line,
+     * in pixels from the left edge of the timeline area.
+     */
+    TimelineTOIController.prototype.x = function () {
+        var now = this.timerService.now();
+
+        if (now === undefined) {
+            return undefined;
+        }
+
+        return this.$scope.zoomController.toPixels(this.timerService.now());
+    };
+
+    /**
+     * Check if there is an active time-of-interest to be shown.
+     * @return {boolean} true when active
+     */
+    TimelineTOIController.prototype.isActive = function () {
+        return this.x() !== undefined;
+    };
+
+    /**
+     * Check if the timeline should be following time conductor bounds.
+     * @return {boolean} true when following
+     */
+    TimelineTOIController.prototype.isFollowing = function () {
+        return !!this.$scope.scroll.follow && this.timerService.now() !== undefined;
+    };
+
+    return TimelineTOIController;
+});

platform/features/timeline/src/controllers/TimelineZoomController.js

@@ -32,7 +32,8 @@ define(
             // Prefer to start with the middle index
             var zoomLevels = ZOOM_CONFIGURATION.levels || [1000],
                 zoomIndex = Math.floor(zoomLevels.length / 2),
-                tickWidth = ZOOM_CONFIGURATION.width || 200;
+                tickWidth = ZOOM_CONFIGURATION.width || 200,
+                lastWidth = Number.MAX_VALUE; // Don't constrain prematurely
 
             function toMillis(pixels) {
                 return (pixels / tickWidth) * zoomLevels[zoomIndex];
@@ -55,19 +56,29 @@ define(
 
             function setScroll(x) {
                 $window.requestAnimationFrame(function () {
-                    $scope.scroll.x = x;
+                    $scope.scroll.x = Math.min(
+                        Math.max(x, 0),
+                        lastWidth - $scope.scroll.width
+                    );
                     $scope.$apply();
                 });
             }
 
-            function initializeZoomFromTimespan(timespan) {
-                var timelineDuration = timespan.getDuration();
+            function initializeZoomFromStartEnd(start, end) {
+                var duration = end - start;
                 zoomIndex = 0;
-                while (toMillis($scope.scroll.width) < timelineDuration &&
+                while (toMillis($scope.scroll.width) < duration &&
                         zoomIndex < zoomLevels.length - 1) {
                     zoomIndex += 1;
                 }
-                setScroll(toPixels(timespan.getStart()));
+                setScroll(toPixels(start));
+            }
+
+            function initializeZoomFromTimespan(timespan) {
+                return initializeZoomFromStartEnd(
+                    timespan.getStart(),
+                    timespan.getEnd()
+                );
             }
 
             function initializeZoom() {
@@ -101,6 +112,13 @@ define(
                     }
                     return zoomLevels[zoomIndex];
                 },
+                /**
+                 * Adjust the current zoom bounds to fit both the
+                 * start and the end time provided.
+                 * @param {number} start the starting timestamp
+                 * @param {number} end the ending timestamp
+                 */
+                bounds: initializeZoomFromStartEnd,
                 /**
                  * Set the zoom level to fit the bounds of the timeline
                  * being viewed.
@@ -119,14 +137,14 @@ define(
                  */
                 toMillis: toMillis,
                 /**
-                 * Get the pixel width necessary to fit the specified
-                 * timestamp, expressed as an offset in milliseconds from
-                 * the start of the timeline.
+                 * Set the maximum timestamp value to be displayed, and get
+                 * the pixel width necessary to display this value.
                  * @param {number} timestamp the time to display
                  */
                 width: function (timestamp) {
                     var pixels = Math.ceil(toPixels(timestamp * (1 + PADDING)));
-                    return Math.max($scope.scroll.width, pixels);
+                    lastWidth = Math.max($scope.scroll.width, pixels);
+                    return lastWidth;
                 }
             };
         }

platform/features/timeline/src/directives/MCTResourceGraphDrop.js

@@ -0,0 +1,81 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2009-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.
+ *****************************************************************************/
+
+define(
+    ['./SwimlaneDragConstants'],
+    function (SwimlaneDragConstants) {
+
+        /**
+         * Defines the `mct-resource-graph-drop` directive. When a drop occurs
+         * on an element with this attribute, the swimlane targeted by the drop
+         * will receive the dropped domain object (at which point it can handle
+         * the drop, typically by toggling the swimlane graph.)
+         * @param {DndService} dndService drag-and-drop service
+         */
+        function MCTResourceGraphDrop(dndService) {
+
+            function link(scope, element, attrs) {
+                // Handle dragover
+                element.on('dragover', function (e) {
+                    var swimlane = dndService.getData(
+                        SwimlaneDragConstants.TIMELINE_SWIMLANE_DRAG_TYPE
+                    );
+
+                    if (typeof swimlane !== "undefined" && !swimlane.graph()) {
+                        element.addClass('drop-over');
+                        scope.$apply();
+                        e.preventDefault();
+                    }
+                });
+                // Handle drops
+                element.on('drop', function (e) {
+                    var swimlane = dndService.getData(
+                        SwimlaneDragConstants.TIMELINE_SWIMLANE_DRAG_TYPE
+                    );
+
+                    element.removeClass('drop-over');
+
+                    // Only toggle if the graph isn't already set
+                    if (typeof swimlane !== "undefined" && !swimlane.graph()) {
+                        swimlane.toggleGraph();
+                        e.preventDefault();
+                    }
+                });
+                // Clear highlights when drag leaves this swimlane
+                element.on('dragleave', function (e) {
+                    element.removeClass('drop-over');
+                    scope.$apply();
+                    e.preventDefault();
+                });
+            }
+
+            return {
+                // Applies to attributes
+                restrict: "A",
+                // Link using above function
+                link: link
+            };
+        }
+
+        return MCTResourceGraphDrop;
+    }
+);

platform/features/timeline/test/controllers/TimelineTOIControllerSpec.js

@@ -0,0 +1,138 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2009-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.
+ *****************************************************************************/
+
+define([
+    "../../src/controllers/TimelineTOIController",
+    "EventEmitter"
+], function (TimelineTOIController, EventEmitter) {
+    describe("The timeline TOI controller", function () {
+        var mockmct;
+        var mockTimerService;
+        var mockScope;
+        var controller;
+
+        beforeEach(function () {
+            mockmct = { time: new EventEmitter() };
+            mockmct.time.bounds = jasmine.createSpy('bounds');
+            mockTimerService = new EventEmitter();
+            mockTimerService.getTimer = jasmine.createSpy('getTimer');
+            mockTimerService.hasTimer = jasmine.createSpy('hasTimer');
+            mockTimerService.now = jasmine.createSpy('now');
+            mockTimerService.convert = jasmine.createSpy('convert');
+            mockScope = new EventEmitter();
+            mockScope.$on = mockScope.on.bind(mockScope);
+            mockScope.zoomController = jasmine.createSpyObj('zoom', [
+                'bounds',
+                'toPixels'
+            ]);
+            mockScope.scroll = { x: 10, width: 1000 };
+
+            spyOn(mockmct.time, "on").andCallThrough();
+            spyOn(mockmct.time, "off").andCallThrough();
+            spyOn(mockTimerService, "on").andCallThrough();
+            spyOn(mockTimerService, "off").andCallThrough();
+
+            controller = new TimelineTOIController(
+                mockmct,
+                mockTimerService,
+                mockScope
+            );
+        });
+
+        it("reports an undefined x position initially", function () {
+            expect(controller.x()).toBeUndefined();
+        });
+
+        it("listens for bounds changes", function () {
+            expect(mockmct.time.on)
+                .toHaveBeenCalledWith('bounds', controller.bounds);
+        });
+
+        it("listens for timer changes", function () {
+            expect(mockTimerService.on)
+                .toHaveBeenCalledWith('change', controller.change);
+        });
+
+        it("is not active", function () {
+            expect(controller.isActive()).toBe(false);
+        });
+
+        describe("on $destroy from scope", function () {
+            beforeEach(function () {
+                mockScope.emit("$destroy");
+            });
+
+            it("unregisters listeners", function () {
+                expect(mockmct.time.off)
+                    .toHaveBeenCalledWith('bounds', controller.bounds);
+                expect(mockTimerService.off)
+                    .toHaveBeenCalledWith('change', controller.change);
+            });
+        });
+
+        describe("when a timer and timestamp present", function () {
+            var mockTimer;
+            var testNow;
+
+            beforeEach(function () {
+                testNow = 333221;
+                mockScope.zoomController.toPixels
+                    .andCallFake(function (millis) {
+                        return millis * 2;
+                    });
+                mockTimerService.emit('change', mockTimer);
+                mockTimerService.now.andReturn(testNow);
+            });
+
+            it("reports an x value from the zoomController", function () {
+                var now = mockTimerService.now();
+                var expected = mockScope.zoomController.toPixels(now);
+                expect(controller.x()).toEqual(expected);
+            });
+        });
+
+        describe("when follow mode is disabled", function () {
+            beforeEach(function () {
+                mockScope.scroll.follow = false;
+            });
+
+            it("ignores bounds events", function () {
+                mockmct.time.emit('bounds', { start: 0, end: 1000 });
+                expect(mockScope.zoomController.bounds)
+                    .not.toHaveBeenCalled();
+            });
+        });
+
+        describe("when follow mode is enabled", function () {
+            beforeEach(function () {
+                mockScope.scroll.follow = true;
+                mockTimerService.now.andReturn(500);
+            });
+
+            it("zooms on bounds events", function () {
+                mockmct.time.emit('bounds', { start: 0, end: 1000 });
+                expect(mockScope.zoomController.bounds)
+                    .toHaveBeenCalled();
+            });
+        });
+    });
+});

platform/features/timeline/test/directives/MCTResourceGraphDropSpec.js

@@ -0,0 +1,159 @@
+/*****************************************************************************
+ * Open MCT, Copyright (c) 2009-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.
+ *****************************************************************************/
+
+define(
+    ['../../src/directives/MCTResourceGraphDrop', '../../src/directives/SwimlaneDragConstants'],
+    function (MCTResourceGraphDrop, SwimlaneDragConstants) {
+
+        describe("The mct-resource-graph-drop directive", function () {
+            var mockDndService,
+                mockScope,
+                mockElement,
+                testAttrs,
+                mockSwimlane,
+                testEvent,
+                handlers,
+                directive;
+
+            beforeEach(function () {
+                handlers = {};
+
+                mockDndService = jasmine.createSpyObj(
+                    'dndService',
+                    ['setData', 'getData', 'removeData']
+                );
+                mockScope = jasmine.createSpyObj('$scope', ['$eval', '$apply']);
+                mockElement = jasmine.createSpyObj('element', ['on', 'addClass', 'removeClass']);
+                testAttrs = { mctSwimlaneDrop: "mockSwimlane" };
+                mockSwimlane = jasmine.createSpyObj(
+                    "swimlane",
+                    ['graph', 'toggleGraph']
+                );
+
+                testEvent = {
+                    dataTransfer: { getData: jasmine.createSpy() },
+                    preventDefault: jasmine.createSpy(),
+                    stopPropagation: jasmine.createSpy()
+                };
+
+                testEvent.dataTransfer.getData.andReturn('abc');
+                mockDndService.getData.andCallFake(function (key) {
+                    return key === SwimlaneDragConstants.TIMELINE_SWIMLANE_DRAG_TYPE ?
+                        mockSwimlane : undefined;
+                });
+
+                mockSwimlane.graph.andReturn(false);
+
+                directive = new MCTResourceGraphDrop(mockDndService);
+                directive.link(mockScope, mockElement, testAttrs);
+
+                mockElement.on.calls.forEach(function (call) {
+                    handlers[call.args[0]] = call.args[1];
+                });
+            });
+
+            it("is available as an attribute", function () {
+                expect(directive.restrict).toEqual("A");
+            });
+
+            [false, true].forEach(function (graphing) {
+                describe("when swimlane graph is " + (graphing ? "" : "not ") + "enabled", function () {
+                    beforeEach(function () {
+                        mockSwimlane.graph.andReturn(graphing);
+                    });
+
+
+                    describe("on dragover", function () {
+                        var prefix = !graphing ? "does" : "does not";
+
+                        beforeEach(function ()  {
+                            handlers.dragover(testEvent);
+                        });
+
+                        it(prefix + " add a drop-over class", function () {
+                            var expectAddClass = expect(mockElement.addClass);
+                            (!graphing ? expectAddClass : expectAddClass.not)
+                                .toHaveBeenCalledWith('drop-over');
+                        });
+
+                        it(prefix + " call $apply on scope", function () {
+                            var expectApply = expect(mockScope.$apply);
+                            (!graphing ? expectApply : expectApply.not)
+                                .toHaveBeenCalled();
+                        });
+
+                        it(prefix + " prevent default", function () {
+                            var expectPreventDefault = expect(testEvent.preventDefault);
+                            (!graphing ? expectPreventDefault : expectPreventDefault.not)
+                                .toHaveBeenCalled();
+                        });
+                    });
+
+                    describe("on drop", function () {
+                        var prefix = !graphing ? "does" : "does not";
+
+                        beforeEach(function ()  {
+                            handlers.drop(testEvent);
+                        });
+
+                        it("removes any drop-over class", function () {
+                            expect(mockElement.removeClass)
+                                .toHaveBeenCalledWith('drop-over');
+                        });
+
+                        it(prefix + " toggle the swimlane's resource graph", function () {
+                            var expectToggle = expect(mockSwimlane.toggleGraph);
+                            (!graphing ? expectToggle : expectToggle.not)
+                                .toHaveBeenCalled();
+                        });
+
+                        it(prefix + " prevent default", function () {
+                            var expectPreventDefault = expect(testEvent.preventDefault);
+                            (!graphing ? expectPreventDefault : expectPreventDefault.not)
+                                .toHaveBeenCalled();
+                        });
+                    });
+
+                    describe("on dragleave", function () {
+                        beforeEach(function ()  {
+                            handlers.dragleave(testEvent);
+                        });
+
+                        it("removes any drop-over class", function () {
+                            expect(mockElement.removeClass)
+                                .toHaveBeenCalledWith('drop-over');
+                        });
+
+                        it("calls $apply on scope", function () {
+                            expect(mockScope.$apply).toHaveBeenCalled();
+                        });
+
+                        it("calls preventDefault on events", function () {
+                            expect(testEvent.preventDefault).toHaveBeenCalled();
+                        });
+                    });
+                });
+            });
+
+        });
+    }
+);

platform/forms/res/templates/controls/color.html

@@ -24,21 +24,22 @@
 
     <span class="l-click-area" ng-click="toggle.toggle()"></span>
     <span class="color-swatch"
+          ng-class="{'no-selection':ngModel[field] === 'transparent'}"
           ng-style="{
-             background: ngModel[field]
+             'background-color': ngModel[field]
          }">
     </span>
     <span class="title-label" ng-if="structure.text">
         {{structure.text}}
     </span>
 
-    <div class="menu l-color-palette"
+    <div class="menu l-palette l-color-palette"
         ng-controller="ColorController as colors"
         ng-show="toggle.isActive()">
         <div
             class="l-palette-row l-option-row"
             ng-if="!structure.mandatory">
-            <div class="l-palette-item s-palette-item {{ngModel[field] === 'transparent' ? 'icon-check' : '' }}"
+            <div class="l-palette-item s-palette-item no-selection {{ngModel[field] === 'transparent' ? 'selected' : '' }}"
                 ng-click="ngModel[field] = 'transparent'">
             </div>
             <span class="l-palette-item-label">None</span>
@@ -46,7 +47,7 @@
         <div
             class="l-palette-row"
             ng-repeat="group in colors.groups()">
-            <div class="l-palette-item s-palette-item {{ngModel[field] === color ? 'icon-check' : '' }}"
+            <div class="l-palette-item s-palette-item {{ngModel[field] === color ? 'selected' : '' }}"
                 ng-repeat="color in group"
                 ng-style="{ background: color }"
                 ng-click="ngModel[field] = color">

platform/forms/res/templates/controls/composite.html

@@ -27,7 +27,7 @@
                          ng-required="ngRequired || compositeCtrl.isNonEmpty(ngModel[field])"
                          ng-pattern="ngPattern"
                          options="item.options"
-                         structure="row"
+                         structure="item"
                          field="$index">
             </mct-control>
             <span class="composite-control-label">

src/MCT.js

@@ -106,9 +106,9 @@ define([
          *
          * @type {module:openmct.ViewRegistry}
          * @memberof module:openmct.MCT#
-         * @name mainViews
+         * @name objectViews
          */
-        this.mainViews = new ViewRegistry();
+        this.objectViews = new ViewRegistry();
 
         /**
          * Registry for views which should appear in the Inspector area.
@@ -255,6 +255,18 @@ define([
             this.legacyExtension('types', legacyDefinition);
         }.bind(this));
 
+        this.objectViews.getAllProviders().forEach(function (p) {
+            this.legacyExtension('views', {
+                key: p.key,
+                provider: p,
+                name: p.name,
+                cssClass: p.cssClass,
+                description: p.description,
+                editable: p.editable,
+                template: '<mct-view mct-provider-key="' + p.key + '"/>'
+            });
+        }, this);
+
         legacyRegistry.register('adapter', this.legacyBundle);
         legacyRegistry.enable('adapter');
         /**

src/adapter/bundle.js

@@ -24,7 +24,6 @@ define([
     'legacyRegistry',
     './actions/ActionDialogDecorator',
     './capabilities/AdapterCapability',
-    './controllers/AdaptedViewController',
     './directives/MCTView',
     './services/Instantiate',
     './services/MissingModelCompatibilityDecorator',
@@ -32,13 +31,11 @@ define([
     './policies/AdapterCompositionPolicy',
     './policies/AdaptedViewPolicy',
     './runs/AlternateCompositionInitializer',
-    './runs/TimeSettingsURLHandler',
-    'text!./templates/adapted-view-template.html'
+    './runs/TimeSettingsURLHandler'
 ], function (
     legacyRegistry,
     ActionDialogDecorator,
     AdapterCapability,
-    AdaptedViewController,
     MCTView,
     Instantiate,
     MissingModelCompatibilityDecorator,
@@ -46,15 +43,15 @@ define([
     AdapterCompositionPolicy,
     AdaptedViewPolicy,
     AlternateCompositionInitializer,
-    TimeSettingsURLHandler,
-    adaptedViewTemplate
+    TimeSettingsURLHandler
 ) {
     legacyRegistry.register('src/adapter', {
         "extensions": {
             "directives": [
                 {
                     key: "mctView",
-                    implementation: MCTView
+                    implementation: MCTView,
+                    depends: ["openmct"]
                 }
             ],
             capabilities: [
@@ -63,16 +60,6 @@ define([
                     implementation: AdapterCapability
                 }
             ],
-            controllers: [
-                {
-                    key: "AdaptedViewController",
-                    implementation: AdaptedViewController,
-                    depends: [
-                        '$scope',
-                        'openmct'
-                    ]
-                }
-            ],
             services: [
                 {
                     key: "instantiate",
@@ -135,12 +122,6 @@ define([
                     depends: ["openmct", "$location", "$rootScope"]
                 }
             ],
-            views: [
-                {
-                    key: "adapted-view",
-                    template: adaptedViewTemplate
-                }
-            ],
             licenses: [
                 {
                     "name": "almond",

src/adapter/capabilities/APICapabilityDecorator.js

@@ -22,10 +22,12 @@
 
 define([
     './synchronizeMutationCapability',
-    './AlternateCompositionCapability'
+    './AlternateCompositionCapability',
+    './patchViewCapability'
 ], function (
     synchronizeMutationCapability,
-    AlternateCompositionCapability
+    AlternateCompositionCapability,
+    patchViewCapability
 ) {
 
     /**
@@ -46,6 +48,9 @@ define([
             capabilities.mutation =
                 synchronizeMutationCapability(capabilities.mutation);
         }
+        if (capabilities.view) {
+            capabilities.view = patchViewCapability(capabilities.view);
+        }
         if (AlternateCompositionCapability.appliesTo(model, id)) {
             capabilities.composition = function (domainObject) {
                 return new AlternateCompositionCapability(this.$injector, domainObject);

src/adapter/capabilities/patchViewCapability.js

@@ -0,0 +1,60 @@
+/*****************************************************************************
+ * 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([
+    'lodash'
+], function (
+    _
+) {
+
+    function patchViewCapability(viewConstructor) {
+        return function makeCapability(domainObject) {
+            var capability = viewConstructor(domainObject);
+            var oldInvoke = capability.invoke.bind(capability);
+
+            capability.invoke = function () {
+                var availableViews = oldInvoke();
+                var newDomainObject = capability
+                    .domainObject
+                    .useCapability('adapter');
+
+                return _(availableViews).map(function (v, i) {
+                    var vd = {
+                        view: v,
+                        priority: i + 100 // arbitrary to allow new views to
+                        // be defaults by returning priority less than 100.
+                    };
+                    if (v.provider && v.provider.priority) {
+                        vd.priority = v.provider.priority(newDomainObject);
+                    }
+                    return vd;
+                })
+                .sortBy('priority')
+                .map('view')
+                .value();
+            };
+            return capability;
+        };
+    }
+
+    return patchViewCapability;
+});

src/adapter/directives/MCTView.js

@@ -21,18 +21,23 @@
  *****************************************************************************/
 
 define([
-    'angular',
-    './Region'
 ], function (
-    angular,
-    Region
 ) {
-    function MCTView() {
+    function MCTView(openmct) {
         return {
-            restrict: 'A',
+            restrict: 'E',
             link: function (scope, element, attrs) {
-                var region = new Region(element[0]);
-                scope.$watch(attrs.mctView, region.show.bind(region));
+                var provider = openmct.objectViews.getByProviderKey(attrs.mctProviderKey);
+                var view = new provider.view(scope.domainObject.useCapability('adapter'));
+                var domElement = element[0];
+
+                view.show(domElement);
+
+                if (view.destroy) {
+                    scope.$on('$destroy', function () {
+                        view.destroy(domElement);
+                    });
+                }
             }
         };
     }

src/adapter/policies/AdaptedViewPolicy.js

@@ -29,9 +29,9 @@ define([], function () {
         view,
         legacyObject
     ) {
-        if (view.key === 'adapted-view') {
+        if (view.hasOwnProperty('provider')) {
             var domainObject = legacyObject.useCapability('adapter');
-            return this.openmct.mainViews.get(domainObject).length > 0;
+            return view.provider.canView(domainObject);
         }
         return true;
     };

src/api/objects/ObjectAPI.js

@@ -50,11 +50,18 @@ define([
         this.rootProvider = new RootObjectProvider(this.rootRegistry);
     }
 
+    /**
+     * Set fallback provider, this is an internal API for legacy reasons.
+     * @private
+     */
     ObjectAPI.prototype.supersecretSetFallbackProvider = function (p) {
         this.fallbackProvider = p;
     };
 
-    // Retrieve the provider for a given key.
+    /**
+     * Retrieve the provider for a given identifier.
+     * @private
+     */
     ObjectAPI.prototype.getProvider = function (identifier) {
         if (identifier.key === 'ROOT') {
             return this.rootProvider;
@@ -135,27 +142,28 @@ define([
      * @returns {Promise} a promise which will resolve when the domain object
      *          has been saved, or be rejected if it cannot be saved
      */
+    ObjectAPI.prototype.get = function (identifier) {
+        identifier = utils.parseKeyString(identifier);
+        var provider = this.getProvider(identifier);
 
-    [
-        'save',
-        'delete',
-        'get'
-    ].forEach(function (method) {
-        ObjectAPI.prototype[method] = function () {
-            var identifier = arguments[0],
-                provider = this.getProvider(identifier);
+        if (!provider) {
+            throw new Error('No Provider Matched');
+        }
 
-            if (!provider) {
-                throw new Error('No Provider Matched');
-            }
+        if (!provider.get) {
+            throw new Error('Provider does not support get!');
+        }
 
-            if (!provider[method]) {
-                throw new Error('Provider does not support [' + method + '].');
-            }
+        return provider.get(identifier);
+    };
 
-            return provider[method].apply(provider, arguments);
-        };
-    });
+    ObjectAPI.prototype.delete = function () {
+        throw new Error('Delete not implemented');
+    };
+
+    ObjectAPI.prototype.save = function () {
+        throw new Error('Save not implemented');
+    };
 
     /**
      * Add a root-level object.

src/api/ui/dialog.html

@@ -4,7 +4,7 @@
         <a class="close icon-x-in-circle"></a>
         <div class="abs inner-holder contents">
             <div class="abs top-bar">
-                <div class="title"></div>
+                <div class="dialog-title"></div>
                 <div class="hint"></div>
             </div>
             <div class='abs editor'>

src/plugins/URLIndicatorPlugin/URLIndicator.js

@@ -0,0 +1,97 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+define(
+    [],
+    function () {
+
+        // Set of connection states; changing among these states will be
+        // reflected in the indicator's appearance.
+        // CONNECTED: Everything nominal, expect to be able to read/write.
+        // DISCONNECTED: HTTP failed; maybe misconfigured, disconnected.
+        // PENDING: Still trying to connect, and haven't failed yet.
+        var CONNECTED = {
+                glyphClass: "ok"
+            },
+            PENDING = {
+                glyphClass: 'caution'
+            },
+            DISCONNECTED = {
+                glyphClass: "err"
+            };
+        function URLIndicator($http, $interval) {
+            var self = this;
+            this.cssClass = this.options.cssClass ? this.options.cssClass : "icon-database";
+            this.URLpath = this.options.url;
+            this.label = this.options.label ? this.options.label : this.options.url;
+            this.interval = this.options.interval || 10000;
+            this.state = PENDING;
+
+            function handleError(e) {
+                self.state = DISCONNECTED;
+            }
+            function handleResponse() {
+                self.state = CONNECTED;
+            }
+            function updateIndicator() {
+                $http.get(self.URLpath).then(handleResponse, handleError);
+            }
+            updateIndicator();
+            $interval(updateIndicator, self.interval, 0, false);
+        }
+
+        URLIndicator.prototype.getCssClass = function () {
+            return this.cssClass;
+        };
+        URLIndicator.prototype.getGlyphClass = function () {
+            return this.state.glyphClass;
+        };
+        URLIndicator.prototype.getText = function () {
+            switch (this.state) {
+                case CONNECTED: {
+                    return this.label + " is connected";
+                }
+                case PENDING: {
+                    return "Checking status of " + this.label + " please stand by...";
+                }
+                case DISCONNECTED: {
+                    return this.label + " is offline";
+                }
+            }
+        };
+        URLIndicator.prototype.getDescription = function () {
+            switch (this.state) {
+                case CONNECTED: {
+                    return this.label + " is online, checking status every " +
+                    this.interval + " milliseconds.";
+                }
+                case PENDING: {
+                    return "Checking status of " + this.label + " please stand by...";
+                }
+                case DISCONNECTED: {
+                    return this.label + " is offline, checking status every " +
+                    this.interval + " milliseconds";
+                }
+            }
+        };
+        return URLIndicator;
+    });

src/plugins/URLIndicatorPlugin/URLIndicatorPlugin.js

@@ -0,0 +1,20 @@
+define(
+  [
+    './URLIndicator'
+  ],
+  function URLIndicatorPlugin(URLIndicator) {
+    return function (opts) {
+        // Wrap the plugin in a function so we can apply the arguments.
+        function URLIndicatorWrapper() {
+            this.options = opts;
+            URLIndicator.apply(this, arguments);
+        }
+        URLIndicatorWrapper.prototype = Object.create(URLIndicator.prototype);
+        return function install(openmct) {
+            openmct.legacyExtension('indicators', {
+                  "implementation": URLIndicatorWrapper,
+                  "depends": ["$http", "$interval"]
+              });
+        };
+    };
+});

src/plugins/URLIndicatorPlugin/URLIndicatorSpec.js

@@ -0,0 +1,158 @@
+/*****************************************************************************
+ * 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.
+ *****************************************************************************/
+
+define(
+    ["./URLIndicator"],
+    function (URLIndicator) {
+
+        describe("The URLIndicator", function () {
+            var mockHttp,
+                mockInterval,
+                mockPromise,
+                opts,
+                Indicator,
+                indicatorWrapper;
+
+            beforeEach(function () {
+                mockHttp = jasmine.createSpyObj("$http", ["get"]);
+                mockInterval = jasmine.createSpy("$interval");
+                mockPromise = jasmine.createSpyObj("promise", ["then"]);
+                opts = {
+                    url: "http://localhost:8080",
+                    interval: 1337 //some number
+                };
+                mockHttp.get.andReturn(mockPromise);
+                Indicator = function () {
+                    this.options = opts;
+                    URLIndicator.call(this, mockHttp, mockInterval);
+                };
+                Indicator.prototype = Object.create(URLIndicator.prototype);
+                indicatorWrapper = new Indicator();
+            });
+            it("polls for changes", function () {
+                expect(mockInterval).toHaveBeenCalledWith(
+                    jasmine.any(Function),
+                    opts.interval,
+                    0,
+                    false
+                );
+            });
+
+            it("has a database cssClass as default", function () {
+                expect(indicatorWrapper.getCssClass()).toEqual("icon-database");
+            });
+
+            it("consults the url with the path supplied", function () {
+                expect(mockHttp.get).toHaveBeenCalledWith(opts.url);
+            });
+
+            it("changes when the database connection is nominal", function () {
+                var initialText = indicatorWrapper.getText(),
+                    initialDescrption = indicatorWrapper.getDescription(),
+                    initialGlyphClass = indicatorWrapper.getGlyphClass();
+
+                // Nominal just means getting back an object, without
+                // an error field.
+                mockPromise.then.mostRecentCall.args[0]({ data: {} });
+
+                // Verify that these values changed;
+                // don't test for specific text.
+                expect(indicatorWrapper.getText()).not.toEqual(initialText);
+                expect(indicatorWrapper.getGlyphClass()).not.toEqual(initialGlyphClass);
+                expect(indicatorWrapper.getDescription()).not.toEqual(initialDescrption);
+
+                // Do check for specific class
+                expect(indicatorWrapper.getGlyphClass()).toEqual("ok");
+            });
+
+            it("changes when the server cannot be reached", function () {
+                var initialText = indicatorWrapper.getText(),
+                    initialDescrption = indicatorWrapper.getDescription(),
+                    initialGlyphClass = indicatorWrapper.getGlyphClass();
+
+                // Nominal just means getting back an object, without
+                // an error field.
+                mockPromise.then.mostRecentCall.args[1]({ data: {} });
+
+                // Verify that these values changed;
+                // don't test for specific text.
+                expect(indicatorWrapper.getText()).not.toEqual(initialText);
+                expect(indicatorWrapper.getGlyphClass()).not.toEqual(initialGlyphClass);
+                expect(indicatorWrapper.getDescription()).not.toEqual(initialDescrption);
+
+                // Do check for specific class
+                expect(indicatorWrapper.getGlyphClass()).toEqual("err");
+            });
+            it("has a customized cssClass if supplied in initialization", function () {
+                opts = {
+                    url: "http://localhost:8080",
+                    cssClass: "cssClass-checked",
+                    interval: 10000
+                };
+                indicatorWrapper = new Indicator();
+                expect(indicatorWrapper.getCssClass()).toEqual("cssClass-checked");
+            });
+            it("has a customized interval if supplied in initialization", function () {
+                opts = {
+                    url: "http://localhost:8080",
+                    interval: 1814
+                };
+                indicatorWrapper = new Indicator();
+                expect(mockInterval).toHaveBeenCalledWith(
+                    jasmine.any(Function),
+                    1814,
+                    0,
+                    false
+                );
+            });
+            it("has a custom label if supplied in initialization", function () {
+                opts = {
+                    url: "http://localhost:8080",
+                    label: "Localhost"
+                };
+                indicatorWrapper = new Indicator();
+                expect(indicatorWrapper.getText()).toEqual("Checking status of Localhost please stand by...");
+            });
+            it("has a default label if not supplied in initialization", function () {
+                opts = {
+                    url: "http://localhost:8080"
+                };
+                indicatorWrapper = new Indicator();
+                expect(indicatorWrapper.getText()).toEqual(
+                  "Checking status of http://localhost:8080 please stand by..."
+                );
+            });
+            it("has a default interval if not supplied in initialization", function () {
+                opts = {
+                    url: "http://localhost:8080"
+                };
+                indicatorWrapper = new Indicator();
+                expect(mockInterval).toHaveBeenCalledWith(
+                    jasmine.any(Function),
+                    10000,
+                    0,
+                    false
+                );
+            });
+        });
+    }
+);

src/plugins/plugins.js

@@ -27,7 +27,9 @@ define([
     '../../platform/features/autoflow/plugin',
     './timeConductor/plugin',
     '../../example/imagery/plugin',
-    '../../platform/import-export/bundle'
+    '../../platform/import-export/bundle',
+    './summaryWidget/plugin',
+    './URLIndicatorPlugin/URLIndicatorPlugin'
 ], function (
     _,
     UTCTimeSystem,
@@ -35,7 +37,9 @@ define([
     AutoflowPlugin,
     TimeConductorPlugin,
     ExampleImagery,
-    ImportExport
+    ImportExport,
+    SummaryWidget,
+    URLIndicatorPlugin
 ) {
     var bundleMap = {
         CouchDB: 'platform/persistence/couch',
@@ -121,5 +125,8 @@ define([
 
     plugins.ExampleImagery = ExampleImagery;
 
+    plugins.SummaryWidget = SummaryWidget;
+    plugins.URLIndicatorPlugin = URLIndicatorPlugin;
+
     return plugins;
 });

src/plugins/summaryWidget/SummaryWidgetsCompositionPolicy.js

@@ -20,21 +20,25 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-define([], function () {
-    function AdaptedViewController($scope, openmct) {
-        function refresh(legacyObject) {
-            if (!legacyObject) {
-                $scope.view = undefined;
-                return;
-            }
+define(
+    [],
+    function () {
 
-            var domainObject = legacyObject.useCapability('adapter');
-            var providers = openmct.mainViews.get(domainObject);
-            $scope.view = providers[0] && providers[0].view(domainObject);
+        function SummaryWidgetsCompositionPolicy(openmct) {
+            this.openmct = openmct;
         }
 
-        $scope.$watch('domainObject', refresh);
-    }
+        SummaryWidgetsCompositionPolicy.prototype.allow = function (parent, child) {
+            var parentType = parent.getCapability('type');
+            var newStyleChild = child.useCapability('adapter');
 
-    return AdaptedViewController;
-});
+            if (parentType.instanceOf('summary-widget') && !this.openmct.telemetry.canProvideTelemetry(newStyleChild)) {
+                return false;
+            }
+
+            return true;
+        };
+
+        return SummaryWidgetsCompositionPolicy;
+    }
+);

src/plugins/summaryWidget/plugin.js

@@ -0,0 +1,67 @@
+define(['./src/SummaryWidget', './SummaryWidgetsCompositionPolicy'], function (SummaryWidget, SummaryWidgetsCompositionPolicy) {
+
+    function plugin() {
+
+        var widgetType = {
+            name: 'Summary Widget',
+            description: 'A compact status update for collections of telemetry-producing items',
+            creatable: true,
+            cssClass: 'icon-summary-widget',
+            initialize: function (domainObject) {
+                domainObject.composition = [];
+                domainObject.configuration = {};
+                domainObject.openNewTab = 'thisTab';
+            },
+            form: [
+                {
+                    "key": "url",
+                    "name": "URL",
+                    "control": "textfield",
+                    "pattern": "^(ftp|https?)\\:\\/\\/",
+                    "required": false,
+                    "cssClass": "l-input-lg"
+                },
+                {
+                    "key": "openNewTab",
+                    "name": "Tab to Open Hyperlink",
+                    "control": "select",
+                    "options": [
+                            {
+                                "value": "thisTab",
+                                "name": "Open in this tab"
+                            },
+                            {
+                                "value": "newTab",
+                                "name": "Open in a new tab"
+                            }
+                        ],
+                    "cssClass": "l-inline"
+                }
+            ]
+        };
+
+        function initViewProvider(openmct) {
+            return {
+                name: 'Widget View',
+                view: function (domainObject) {
+                    return new SummaryWidget(domainObject, openmct);
+                },
+                canView: function (domainObject) {
+                    return (domainObject.type === 'summary-widget');
+                },
+                editable: true,
+                key: 'summaryWidgets'
+            };
+        }
+
+        return function install(openmct) {
+            openmct.types.addType('summary-widget', widgetType);
+            openmct.objectViews.addProvider(initViewProvider(openmct));
+            openmct.legacyExtension('policies', {category: 'composition',
+                implementation: SummaryWidgetsCompositionPolicy, depends: ['openmct']
+            });
+        };
+    }
+
+    return plugin;
+});

src/plugins/summaryWidget/res/conditionTemplate.html

@@ -0,0 +1,11 @@
+<li class="t-condition">
+    <label class="t-condition-context">when</label>
+    <span class="controls">
+        <span class="t-configuration"> </span>
+        <span class="t-value-inputs"> </span>
+    </span>
+    <span class="flex-elem l-condition-action-buttons-wrapper">
+        <a class="s-icon-button icon-duplicate t-duplicate" title="Duplicate this condition"></a>
+        <a class="s-icon-button icon-trash t-delete" title="Delete this condition"></a>
+    </span>
+</li>

src/plugins/summaryWidget/res/input/paletteTemplate.html

@@ -0,0 +1,10 @@
+<a class="e-control s-button s-menu-button menu-element">
+   <span class="l-click-area"></span>
+   <span class="t-swatch"></span>
+   <div class="menu l-palette">
+       <div class="l-palette-row l-option-row">
+           <div class="l-palette-item s-palette-item no-selection"></div>
+           <span class="l-palette-item-label">None</span>
+       </div>
+   </div>
+</a>

src/plugins/summaryWidget/res/input/selectTemplate.html

@@ -0,0 +1,4 @@
+<div class="e-control select">
+    <select>
+    </select>
+ </div>

src/plugins/summaryWidget/res/ruleImageTemplate.html

@@ -0,0 +1,3 @@
+<div class="holder widget-rules-wrapper">
+    <div class="t-drag-rule-image l-widget-rule s-widget-rule"></div>
+</div>

src/plugins/summaryWidget/res/ruleTemplate.html

@@ -0,0 +1,69 @@
+<div>
+    <div class="l-widget-rule s-widget-rule l-compact-form">
+        <div class="widget-rule-header">
+            <span class="flex-elem l-widget-thumb-wrapper">
+                <span class="grippy-holder">
+                    <span class="t-grippy grippy"></span>
+                </span>
+                <span class="view-control expanded"></span>
+                <span class="t-widget-thumb widget-thumb">
+                    <span class="widget-label">DEF</span>
+                </span>
+            </span>
+            <span class="flex-elem rule-title">Default Title</span>
+            <span class="flex-elem rule-description grows">Rule description goes here</span>
+            <span class="flex-elem l-rule-action-buttons-wrapper">
+                <a class="s-icon-button icon-duplicate t-duplicate" title="Duplicate this rule"></a>
+                <a class="s-icon-button icon-trash t-delete" title="Delete this rule"></a>
+            </span>
+        </div>
+        <div class="widget-rule-content expanded">
+            <ul>
+                <li>
+                    <label>Rule Name:</label>
+                    <span class="controls">
+                        <input class="t-rule-name-input" type="text" />
+                    </span>
+                </li>
+                <li class="connects-to-previous">
+                    <label>Label:</label>
+                    <span class="controls t-label-input">
+                        <input class="e-control t-rule-label-input" type="text" />
+                    </span>
+                </li>
+                <li class="connects-to-previous">
+                    <label>Message:</label>
+                    <span class="controls">
+                        <input type="text" class="lg s t-rule-message-input"
+                         placeholder="Will appear as tooltip when hovering on the widget"/>
+                    </span>
+                </li>
+                <li class="connects-to-previous">
+                    <label>Style:</label>
+                    <span class="controls t-style-input">
+                    </span>
+                </li>
+            </ul>
+            <ul class="t-widget-rule-config">
+                <li>
+                    <label>Trigger when</label>
+                    <span class="controls">
+                        <div class="e-control select">
+                            <select class="t-trigger">
+                                <option value="any">any condition is met</option>
+                                <option value="all">all conditions are met</option>
+                            </select>
+                         </div>
+                    </span>
+                </li>
+                <li>
+                    <label></label>
+                    <span class="controls">
+                        <a class="e-control s-button labeled add-condition icon-plus">Add Condition</a>
+                    </span>
+                </li>
+            </ul>
+        </div>
+    </div>
+    <div class="t-drag-indicator l-widget-rule s-widget-rule" style="opacity:0;" hidden></div>
+</div>

src/plugins/summaryWidget/res/testDataItemTemplate.html

@@ -0,0 +1,16 @@
+<div class="t-test-data-item l-compact-form l-widget-test-data-item s-widget-test-data-item">
+    <ul>
+        <li>
+            <label>Set </label>
+            <span class="controls">
+                <span class="t-configuration"></span>
+                <span class="equal-to hidden"> equal to </span>
+                <span class="t-value-inputs"></span>
+            </span>
+            <span class="flex-elem l-widget-test-data-item-action-buttons-wrapper">
+                <a class="s-icon-button icon-duplicate t-duplicate" title="Duplicate this test value"></a>
+                <a class="s-icon-button icon-trash t-delete" title="Delete this test value"></a>
+            </span>
+        </li>
+    </ul>
+</div>

src/plugins/summaryWidget/res/testDataTemplate.html

@@ -0,0 +1,15 @@
+<div class="flex-accordion-holder">
+    <div class="flex-accordion-holder t-widget-test-data-content w-widget-test-data-content">
+        <div class="l-enable">
+            <label class="checkbox custom">Apply Test Values
+                <input type="checkbox" class="t-test-data-checkbox">
+                <em></em>
+            </label>
+        </div>
+        <div class="t-test-data-config w-widget-test-data-items">
+            <div class="holder add-rule-button-wrapper align-right">
+                <a id="addRule" class="e-control s-button major labeled add-test-condition icon-plus">Add Test Value</a>
+            </div>
+        </div>
+    </div>
+</div>

src/plugins/summaryWidget/res/widgetTemplate.html

@@ -0,0 +1,23 @@
+<div class="w-summary-widget s-status-no-data">
+    <a id="widget" class="t-summary-widget l-summary-widget s-summary-widget labeled">
+        <span id="widgetLabel" class="label widget-label">Default Static Name</span>
+    </a>
+    <div class="holder flex-elem t-message-inline l-message message-severity-alert t-message-widget-no-data">
+        <div class="w-message-contents l-message-body-only">
+            <div class="message-body">
+                You must add at least one telemetry object to edit this widget.
+            </div>
+        </div>
+    </div>
+    <div class="holder l-flex-col l-flex-accordion flex-elem grows widget-edit-holder expanded-widget-test-data expanded-widget-rules">
+        <div class="section-header"><span class="view-control t-view-control-test-data expanded"></span>Test Data Values</div>
+        <div class="widget-test-data flex-accordion-holder"></div>
+        <div class="section-header"><span class="view-control t-view-control-rules expanded"></span>Rules</div>
+        <div class="holder widget-rules-wrapper flex-elem expanded">
+            <div id="ruleArea" class="widget-rules"></div>
+            <div class="holder add-rule-button-wrapper align-right">
+                <a id="addRule" class="s-button major labeled add-rule-button icon-plus">Add Rule</a>
+            </div>
+        </div>
+    </div>
+</div>

src/plugins/summaryWidget/src/Condition.js

@@ -0,0 +1,188 @@
+define([
+    'text!../res/conditionTemplate.html',
+    './input/ObjectSelect',
+    './input/KeySelect',
+    './input/OperationSelect',
+    'EventEmitter',
+    'zepto'
+], function (
+    conditionTemplate,
+    ObjectSelect,
+    KeySelect,
+    OperationSelect,
+    EventEmitter,
+    $
+) {
+
+    /**
+     * Represents an individual condition for a summary widget rule. Manages the
+     * associated inputs and view.
+     * @param {Object} conditionConfig The configurration for this condition, consisting
+     *                                of object, key, operation, and values fields
+     * @param {number} index the index of this Condition object in it's parent Rule's data model,
+     *                        to be injected into callbacks for removes
+     * @param {ConditionManager} conditionManager A ConditionManager instance for populating
+     *                                            selects with configuration data
+     */
+    function Condition(conditionConfig, index, conditionManager) {
+        this.config = conditionConfig;
+        this.index = index;
+        this.conditionManager = conditionManager;
+
+        this.domElement = $(conditionTemplate);
+        this.eventEmitter = new EventEmitter();
+        this.supportedCallbacks = ['remove', 'duplicate', 'change'];
+
+        this.deleteButton = $('.t-delete', this.domElement);
+        this.duplicateButton = $('.t-duplicate', this.domElement);
+
+        this.selects = {};
+        this.valueInputs = [];
+
+        this.remove = this.remove.bind(this);
+        this.duplicate = this.duplicate.bind(this);
+
+        var self = this;
+
+        /**
+         * Event handler for a change in one of this conditions' custom selects
+         * @param {string} value The new value of this selects
+         * @param {string} property The property of this condition to modify
+         * @private
+         */
+        function onSelectChange(value, property) {
+            if (property === 'operation') {
+                self.generateValueInputs(value);
+            }
+            self.eventEmitter.emit('change', {
+                value: value,
+                property: property,
+                index: self.index
+            });
+        }
+
+        /**
+         * Event handler for this conditions value inputs
+         * @param {Event} event The oninput event that triggered this callback
+         * @private
+         */
+        function onValueInput(event) {
+            var elem = event.target,
+                value = (isNaN(elem.valueAsNumber) ? elem.value : elem.valueAsNumber),
+                inputIndex = self.valueInputs.indexOf(elem);
+
+            self.eventEmitter.emit('change', {
+                value: value,
+                property: 'values[' + inputIndex + ']',
+                index: self.index
+            });
+        }
+
+        this.deleteButton.on('click', this.remove);
+        this.duplicateButton.on('click', this.duplicate);
+
+        this.selects.object = new ObjectSelect(this.config, this.conditionManager, [
+            ['any', 'any telemetry'],
+            ['all', 'all telemetry']
+        ]);
+        this.selects.key = new KeySelect(this.config, this.selects.object, this.conditionManager);
+        this.selects.operation = new OperationSelect(
+            this.config,
+            this.selects.key,
+            this.conditionManager,
+            function (value) {
+                onSelectChange(value, 'operation');
+            });
+
+        this.selects.object.on('change', function (value) {
+            onSelectChange(value, 'object');
+        });
+        this.selects.key.on('change', function (value) {
+            onSelectChange(value, 'key');
+        });
+
+        Object.values(this.selects).forEach(function (select) {
+            $('.t-configuration', self.domElement).append(select.getDOM());
+        });
+
+        $(this.domElement).on('input', 'input', onValueInput);
+    }
+
+    Condition.prototype.getDOM = function (container) {
+        return this.domElement;
+    };
+
+    /**
+     * Register a callback with this condition: supported callbacks are remove, change,
+     * duplicate
+     * @param {string} event The key for the event to listen to
+     * @param {function} callback The function that this rule will envoke on this event
+     * @param {Object} context A reference to a scope to use as the context for
+     *                         context for the callback function
+     */
+    Condition.prototype.on = function (event, callback, context) {
+        if (this.supportedCallbacks.includes(event)) {
+            this.eventEmitter.on(event, callback, context || this);
+        }
+    };
+
+    /**
+     * Hide the appropriate inputs when this is the only condition
+     */
+    Condition.prototype.hideButtons = function () {
+        this.deleteButton.hide();
+    };
+
+    /**
+     * Remove this condition from the configuration. Invokes any registered
+     * remove callbacks
+     */
+    Condition.prototype.remove = function () {
+        this.eventEmitter.emit('remove', this.index);
+    };
+
+    /**
+     * Make a deep clone of this condition's configuration and invoke any duplicate
+     * callbacks with the cloned configuration and this rule's index
+     */
+    Condition.prototype.duplicate = function () {
+        var sourceCondition = JSON.parse(JSON.stringify(this.config));
+        this.eventEmitter.emit('duplicate', {
+            sourceCondition: sourceCondition,
+            index: this.index
+        });
+    };
+
+    /**
+     * When an operation is selected, create the appropriate value inputs
+     * and add them to the view
+     * @param {string} operation The key of currently selected operation
+     */
+    Condition.prototype.generateValueInputs = function (operation) {
+        var evaluator = this.conditionManager.getEvaluator(),
+            inputArea = $('.t-value-inputs', this.domElement),
+            inputCount,
+            inputType,
+            newInput,
+            index = 0;
+
+        inputArea.html('');
+        this.valueInputs = [];
+
+        if (evaluator.getInputCount(operation)) {
+            inputCount = evaluator.getInputCount(operation);
+            inputType = evaluator.getInputType(operation);
+            while (index < inputCount) {
+                if (!this.config.values[index]) {
+                    this.config.values[index] = (inputType === 'number' ? 0 : '');
+                }
+                newInput = $('<input class="sm" type = "' + inputType + '" value = "' + this.config.values[index] + '"> </input>');
+                this.valueInputs.push(newInput.get(0));
+                inputArea.append(newInput);
+                index += 1;
+            }
+        }
+    };
+
+    return Condition;
+});

src/plugins/summaryWidget/src/ConditionEvaluator.js

@@ -0,0 +1,438 @@
+define([], function () {
+
+    /**
+     * Responsible for maintaining the possible operations for conditions
+     * in this widget, and evaluating the boolean value of conditions passed as
+     * input.
+     * @constructor
+     * @param {Object} subscriptionCache A cache consisting of the latest available
+     *                                   data for any telemetry sources in the widget's
+     *                                   composition.
+     * @param {Object} compositionObjs The current set of composition objects to
+     *                                 evaluate for 'any' and 'all' conditions
+     */
+    function ConditionEvaluator(subscriptionCache, compositionObjs) {
+        this.subscriptionCache = subscriptionCache;
+        this.compositionObjs = compositionObjs;
+
+        this.testCache = {};
+        this.useTestCache = false;
+
+        /**
+         * Maps value types to HTML input field types. These
+         * type of inputs will be generated by conditions expecting this data type
+         */
+        this.inputTypes = {
+            number: 'number',
+            string: 'text'
+        };
+
+        /**
+         * Functions to validate that the input to an operation is of the type
+         * that it expects, in order to prevent unexpected behavior. Will be
+         * invoked before the corresponding operation is executed
+         */
+        this.inputValidators = {
+            number: this.validateNumberInput,
+            string: this.validateStringInput
+        };
+
+        /**
+         * A library of operations supported by this rule evaluator. Each operation
+         * consists of the following fields:
+         * operation: a function with boolean return type to be invoked when this
+         *            operation is used. Will be called with an array of inputs
+         *            where input [0] is the telemetry value and input [1..n] are
+         *            any comparison values
+         * text: a human-readable description of this operation to populate selects
+         * appliesTo: an array of identifiers for types that operation may be used on
+         * inputCount: the number of inputs required to get any necessary comparison
+         *             values for the operation
+         * getDescription: A function returning a human-readable shorthand description of
+         *                this operation to populate the 'description' field in the rule header.
+         *                Will be invoked with an array of a condition's comparison values.
+         */
+        this.operations = {
+            equalTo: {
+                operation: function (input) {
+                    return input[0] === input[1];
+                },
+                text: 'is equal to',
+                appliesTo: ['number'],
+                inputCount: 1,
+                getDescription: function (values) {
+                    return ' == ' + values[0];
+                }
+            },
+            notEqualTo: {
+                operation: function (input) {
+                    return input[0] !== input[1];
+                },
+                text: 'is not equal to',
+                appliesTo: ['number'],
+                inputCount: 1,
+                getDescription: function (values) {
+                    return ' != ' + values[0];
+                }
+            },
+            greaterThan: {
+                operation: function (input) {
+                    return input[0] > input[1];
+                },
+                text: 'is greater than',
+                appliesTo: ['number'],
+                inputCount: 1,
+                getDescription: function (values) {
+                    return ' > ' + values[0];
+                }
+            },
+            lessThan: {
+                operation: function (input) {
+                    return input[0] < input[1];
+                },
+                text: 'is less than',
+                appliesTo: ['number'],
+                inputCount: 1,
+                getDescription: function (values) {
+                    return ' < ' + values[0];
+                }
+            },
+            greaterThanOrEq: {
+                operation: function (input) {
+                    return input[0] >= input[1];
+                },
+                text: 'is greater than or equal to',
+                appliesTo: ['number'],
+                inputCount: 1,
+                getDescription: function (values) {
+                    return ' >= ' + values[0];
+                }
+            },
+            lessThanOrEq: {
+                operation: function (input) {
+                    return input[0] <= input[1];
+                },
+                text: 'is less than or equal to',
+                appliesTo: ['number'],
+                inputCount: 1,
+                getDescription: function (values) {
+                    return ' <= ' + values[0];
+                }
+            },
+            between: {
+                operation: function (input) {
+                    return input[0] > input[1] && input[0] < input[2];
+                },
+                text: 'is between',
+                appliesTo: ['number'],
+                inputCount: 2,
+                getDescription: function (values) {
+                    return ' between ' + values[0] + ' and ' + values[1];
+                }
+            },
+            notBetween: {
+                operation: function (input) {
+                    return input[0] < input[1] || input[0] > input[2];
+                },
+                text: 'is not between',
+                appliesTo: ['number'],
+                inputCount: 2,
+                getDescription: function (values) {
+                    return ' not between ' + values[0] + ' and ' + values[1];
+                }
+            },
+            textContains: {
+                operation: function (input) {
+                    return input[0] && input[1] && input[0].includes(input[1]);
+                },
+                text: 'text contains',
+                appliesTo: ['string'],
+                inputCount: 1,
+                getDescription: function (values) {
+                    return ' contains ' + values[0];
+                }
+            },
+            textDoesNotContain: {
+                operation: function (input) {
+                    return input[0] && input[1] && !input[0].includes(input[1]);
+                },
+                text: 'text does not contain',
+                appliesTo: ['string'],
+                inputCount: 1,
+                getDescription: function (values) {
+                    return ' does not contain ' + values[0];
+                }
+            },
+            textStartsWith: {
+                operation: function (input) {
+                    return input[0].startsWith(input[1]);
+                },
+                text: 'text starts with',
+                appliesTo: ['string'],
+                inputCount: 1,
+                getDescription: function (values) {
+                    return ' starts with ' + values[0];
+                }
+            },
+            textEndsWith: {
+                operation: function (input) {
+                    return input[0].endsWith(input[1]);
+                },
+                text: 'text ends with',
+                appliesTo: ['string'],
+                inputCount: 1,
+                getDescription: function (values) {
+                    return ' ends with ' + values[0];
+                }
+            },
+            textIsExactly: {
+                operation: function (input) {
+                    return input[0] === input[1];
+                },
+                text: 'text is exactly',
+                appliesTo: ['string'],
+                inputCount: 1,
+                getDescription: function (values) {
+                    return ' is exactly ' + values[0];
+                }
+            },
+            isUndefined: {
+                operation: function (input) {
+                    return typeof input[0] === 'undefined';
+                },
+                text: 'is undefined',
+                appliesTo: ['string', 'number'],
+                inputCount: 0,
+                getDescription: function () {
+                    return ' is undefined';
+                }
+            }
+        };
+    }
+
+    /**
+     * Evaluate the conditions passed in as an argument, and return the boolean
+     * value of these conditions. Available evaluation modes are 'any', which will
+     * return true if any of the conditions evaluates to true (i.e. logical OR); 'all',
+     * which returns true only if all conditions evalute to true (i.e. logical AND);
+     * or 'js', which returns the boolean value of a custom JavaScript conditional.
+     * @param {} conditions Either an array of objects with object, key, operation,
+     *                      and value fields, or a string representing a JavaScript
+     *                      condition.
+     * @param {string} mode The key of the mode to use when evaluating the conditions.
+     * @return {boolean} The boolean value of the conditions
+     */
+    ConditionEvaluator.prototype.execute = function (conditions, mode) {
+        var active = false,
+            conditionValue,
+            conditionDefined = false,
+            self = this,
+            firstRuleEvaluated = false,
+            compositionObjs = this.compositionObjs;
+
+        if (mode === 'js') {
+            active = this.executeJavaScriptCondition(conditions);
+        } else {
+            (conditions || []).forEach(function (condition) {
+                conditionDefined = false;
+                if (condition.object === 'any') {
+                    conditionValue = false;
+                    Object.keys(compositionObjs).forEach(function (objId) {
+                        try {
+                            conditionValue = conditionValue ||
+                                self.executeCondition(objId, condition.key,
+                                    condition.operation, condition.values);
+                            conditionDefined = true;
+                        } catch (e) {
+                            //ignore a malformed condition
+                        }
+                    });
+                } else if (condition.object === 'all') {
+                    conditionValue = true;
+                    Object.keys(compositionObjs).forEach(function (objId) {
+                        try {
+                            conditionValue = conditionValue &&
+                                self.executeCondition(objId, condition.key,
+                                    condition.operation, condition.values);
+                            conditionDefined = true;
+                        } catch (e) {
+                            //ignore a malformed condition
+                        }
+                    });
+                } else {
+                    try {
+                        conditionValue = self.executeCondition(condition.object, condition.key,
+                            condition.operation, condition.values);
+                        conditionDefined = true;
+                    } catch (e) {
+                        //ignore malformed condition
+                    }
+                }
+
+                if (conditionDefined) {
+                    active = (mode === 'all' && !firstRuleEvaluated ? true : active);
+                    firstRuleEvaluated = true;
+                    if (mode === 'any') {
+                        active = active || conditionValue;
+                    } else if (mode === 'all') {
+                        active = active && conditionValue;
+                    }
+                }
+            });
+        }
+        return active;
+    };
+
+    /**
+     * Execute a condition defined as an object.
+     * @param {string} object The identifier of the telemetry object to retrieve data from
+     * @param {string} key The property of the telemetry object
+     * @param {string} operation The key of the operation in this ConditionEvaluator to executeCondition
+     * @param {string} values An array of comparison values to invoke the operation with
+     * @return {boolean} The value of this condition
+     */
+    ConditionEvaluator.prototype.executeCondition = function (object, key, operation, values) {
+        var cache = (this.useTestCache ? this.testCache : this.subscriptionCache),
+            telemetryValue,
+            op,
+            input,
+            validator;
+
+        if (cache[object] && typeof cache[object][key] !== 'undefined') {
+            telemetryValue = [cache[object][key]];
+        }
+        op = this.operations[operation] && this.operations[operation].operation;
+        input = telemetryValue && telemetryValue.concat(values);
+        validator = op && this.inputValidators[this.operations[operation].appliesTo[0]];
+
+        if (op && input && validator) {
+            return validator(input) && op(input);
+        } else {
+            throw new Error('Malformed condition');
+        }
+    };
+
+    /**
+     * A function that returns true only if each value in its input argument is
+     * of a numerical type
+     * @param {[]} input An array of values
+     * @returns {boolean}
+     */
+    ConditionEvaluator.prototype.validateNumberInput = function (input) {
+        var valid = true;
+        input.forEach(function (value) {
+            valid = valid && (typeof value === 'number');
+        });
+        return valid;
+    };
+
+    /**
+     * A function that returns true only if each value in its input argument is
+     * a string
+     * @param {[]} input An array of values
+     * @returns {boolean}
+     */
+    ConditionEvaluator.prototype.validateStringInput = function (input) {
+        var valid = true;
+        input.forEach(function (value) {
+            valid = valid && (typeof value === 'string');
+        });
+        return valid;
+    };
+
+    /**
+     * Get the keys of operations supported by this evaluator
+     * @return {string[]} An array of the keys of supported operations
+     */
+    ConditionEvaluator.prototype.getOperationKeys = function () {
+        return Object.keys(this.operations);
+    };
+
+    /**
+     * Get the human-readable text corresponding to a given operation
+     * @param {string} key The key of the operation
+     * @return {string} The text description of the operation
+     */
+    ConditionEvaluator.prototype.getOperationText = function (key) {
+        return this.operations[key].text;
+    };
+
+    /**
+     * Returns true only of the given operation applies to a given type
+     * @param {string} key The key of the operation
+     * @param {string} type The value type to query
+     * @returns {boolean} True if the condition applies, false otherwise
+     */
+    ConditionEvaluator.prototype.operationAppliesTo = function (key, type) {
+        return (this.operations[key].appliesTo.includes(type));
+    };
+
+    /**
+     * Return the number of value inputs required by an operation
+     * @param {string} key The key of the operation to query
+     * @return {number}
+     */
+    ConditionEvaluator.prototype.getInputCount = function (key) {
+        if (this.operations[key]) {
+            return this.operations[key].inputCount;
+        }
+    };
+
+    /**
+     * Return the human-readable shorthand description of the operation for a rule header
+     * @param {string} key The key of the operation to query
+     * @param {} values An array of values with which to invoke the getDescription function
+     *                  of the operation
+     * @return {string} A text description of this operation
+     */
+    ConditionEvaluator.prototype.getOperationDescription = function (key, values) {
+        if (this.operations[key]) {
+            return this.operations[key].getDescription(values);
+        }
+    };
+
+    /**
+     * Return the HTML input type associated with a given operation
+     * @param {string} key The key of the operation to query
+     * @return {string} The key for an HTML5 input type
+     */
+    ConditionEvaluator.prototype.getInputType = function (key) {
+        var type;
+        if (this.operations[key]) {
+            type = this.operations[key].appliesTo[0];
+        }
+        if (this.inputTypes[type]) {
+            return this.inputTypes[type];
+        }
+    };
+
+    /**
+     * Returns the HTML input type associated with a value type
+     * @param {string} dataType The JavaScript value type
+     * @return {string} The key for an HTML5 input type
+     */
+    ConditionEvaluator.prototype.getInputTypeById = function (dataType) {
+        return this.inputTypes[dataType];
+    };
+
+    /**
+     * Set the test data cache used by this rule evaluator
+     * @param {object} testCache A mock cache following the format of the real
+     *                           subscription cache
+     */
+    ConditionEvaluator.prototype.setTestDataCache = function (testCache) {
+        this.testCache = testCache;
+    };
+
+    /**
+     * Have this RuleEvaluator pull data values from the provided test cache
+     * instead of its actual subscription cache when evaluating. If invoked with true,
+     * will use the test cache; otherwise, will use the subscription cache
+     * @param {boolean} useTestData Boolean flag
+     */
+    ConditionEvaluator.prototype.useTestData = function (useTestCache) {
+        this.useTestCache = useTestCache;
+    };
+
+    return ConditionEvaluator;
+});

src/plugins/summaryWidget/src/ConditionManager.js

@@ -0,0 +1,373 @@
+define ([
+    './ConditionEvaluator',
+    'EventEmitter',
+    'zepto',
+    'lodash'
+], function (
+    ConditionEvaluator,
+    EventEmitter,
+    $,
+    _
+) {
+
+    /**
+     * Provides a centralized content manager for conditions in the summary widget.
+     * Loads and caches composition and telemetry subscriptions, and maintains a
+     * {ConditionEvaluator} instance to handle evaluation
+     * @constructor
+     * @param {Object} domainObject the Summary Widget domain object
+     * @param {MCT} openmct an MCT instance
+     */
+    function ConditionManager(domainObject, openmct) {
+        this.domainObject = domainObject;
+        this.openmct = openmct;
+
+        this.composition = this.openmct.composition.get(this.domainObject);
+        this.compositionObjs = {};
+        this.eventEmitter = new EventEmitter();
+        this.supportedCallbacks = ['add', 'remove', 'load', 'metadata', 'receiveTelemetry'];
+
+        this.keywordLabels = {
+            any: 'any Telemetry',
+            all: 'all Telemetry'
+        };
+
+        this.telemetryMetadataById = {
+            any: {},
+            all: {}
+        };
+
+        this.telemetryTypesById = {
+            any: {},
+            all: {}
+        };
+
+        this.subscriptions = {};
+        this.subscriptionCache = {};
+        this.loadComplete = false;
+        this.metadataLoadComplete = false;
+        this.evaluator = new ConditionEvaluator(this.subscriptionCache, this.compositionObjs);
+
+        this.composition.on('add', this.onCompositionAdd, this);
+        this.composition.on('remove', this.onCompositionRemove, this);
+        this.composition.on('load', this.onCompositionLoad, this);
+
+        this.composition.load();
+    }
+
+    /**
+     * Register a callback with this ConditionManager: supported callbacks are add
+     * remove, load, metadata, and receiveTelemetry
+     * @param {string} event The key for the event to listen to
+     * @param {function} callback The function that this rule will envoke on this event
+     * @param {Object} context A reference to a scope to use as the context for
+     *                         context for the callback function
+     */
+    ConditionManager.prototype.on = function (event, callback, context) {
+        if (this.supportedCallbacks.includes(event)) {
+            this.eventEmitter.on(event, callback, context || this);
+        } else {
+            throw event + " is not a supported callback. Supported callbacks are " + this.supportedCallbacks;
+        }
+    };
+
+    /**
+     * Given a set of rules, execute the conditions associated with each rule
+     * and return the id of the last rule whose conditions evaluate to true
+     * @param {string[]} ruleOrder An array of rule IDs indicating what order They
+     *                             should be evaluated in
+     * @param {Object} rules An object mapping rule IDs to rule configurations
+     * @return {string} The ID of the rule to display on the widget
+     */
+    ConditionManager.prototype.executeRules = function (ruleOrder, rules) {
+        var self = this,
+            activeId = ruleOrder[0],
+            rule,
+            conditions;
+
+        ruleOrder.forEach(function (ruleId) {
+            rule = rules[ruleId];
+            conditions = rule.getProperty('conditions');
+            if (self.evaluator.execute(conditions, rule.getProperty('trigger'))) {
+                activeId = ruleId;
+            }
+        });
+
+        return activeId;
+    };
+
+    /**
+     * Adds a field to the list of all available metadata fields in the widget
+     * @param {Object} metadatum An object representing a set of telemetry metadata
+     */
+    ConditionManager.prototype.addGlobalMetadata = function (metadatum) {
+        this.telemetryMetadataById.any[metadatum.key] = metadatum;
+        this.telemetryMetadataById.all[metadatum.key] = metadatum;
+    };
+
+    /**
+     * Adds a field to the list of properties for globally available metadata
+     * @param {string} key The key for the property this type applies to
+     * @param {string} type The type that should be associated with this property
+     */
+    ConditionManager.prototype.addGlobalPropertyType = function (key, type) {
+        this.telemetryTypesById.any[key] = type;
+        this.telemetryTypesById.all[key] = type;
+    };
+
+    /**
+     * Given a telemetry-producing domain object, associate each of it's telemetry
+     * fields with a type, parsing from historical data.
+     * @param {Object} object a domain object that can produce telemetry
+     * @return {Promise} A promise that resolves when a telemetry request
+     *                   has completed and types have been parsed
+     */
+    ConditionManager.prototype.parsePropertyTypes = function (object) {
+        var telemetryAPI = this.openmct.telemetry,
+            key,
+            type,
+            self = this;
+
+        self.telemetryTypesById[object.identifier.key] = {};
+        return telemetryAPI.request(object, {size: 1, strategy: 'latest'}).then(function (telemetry) {
+            Object.entries(telemetry[telemetry.length - 1]).forEach(function (telem) {
+                key = telem[0];
+                type = typeof telem[1];
+                self.telemetryTypesById[object.identifier.key][key] = type;
+                self.subscriptionCache[object.identifier.key][key] = telem[1];
+                self.addGlobalPropertyType(key, type);
+            });
+        });
+    };
+
+    /**
+     * Parse types of telemetry fields from all composition objects; used internally
+     * to perform a block types load once initial composition load has completed
+     * @return {Promise} A promise that resolves when all metadata has been loaded
+     *                   and property types parsed
+     */
+    ConditionManager.prototype.parseAllPropertyTypes = function () {
+        var self = this,
+            index = 0,
+            objs = Object.values(self.compositionObjs),
+            promise = new Promise(function (resolve, reject) {
+                if (objs.length === 0) {
+                    resolve();
+                }
+                objs.forEach(function (obj) {
+                    self.parsePropertyTypes(obj).then(function () {
+                        if (index === objs.length - 1) {
+                            resolve();
+                        }
+                        index += 1;
+                    });
+                });
+            });
+        return promise;
+    };
+
+    /**
+     * Invoked when a telemtry subscription yields new data. Updates the LAD
+     * cache and invokes any registered receiveTelemetry callbacks
+     * @param {string} objId The key associated with the telemetry source
+     * @param {datum} datum The new data from the telemetry source
+     * @private
+     */
+    ConditionManager.prototype.handleSubscriptionCallback = function (objId, datum) {
+        this.subscriptionCache[objId] = datum;
+        this.eventEmitter.emit('receiveTelemetry');
+    };
+
+    /**
+     * Event handler for an add event in this Summary Widget's composition.
+     * Sets up subscription handlers and parses its property types.
+     * @param {Object} obj The newly added domain object
+     * @private
+     */
+    ConditionManager.prototype.onCompositionAdd = function (obj) {
+        var compositionKeys,
+            telemetryAPI = this.openmct.telemetry,
+            objId = obj.identifier.key,
+            telemetryMetadata,
+            self = this;
+
+        if (telemetryAPI.canProvideTelemetry(obj)) {
+            self.compositionObjs[objId] = obj;
+            self.telemetryMetadataById[objId] = {};
+
+            compositionKeys = self.domainObject.composition.map(function (object) {
+                return object.key;
+            });
+            if (!compositionKeys.includes(obj.identifier.key)) {
+                self.domainObject.composition.push(obj.identifier);
+            }
+
+            telemetryMetadata = telemetryAPI.getMetadata(obj).values();
+            telemetryMetadata.forEach(function (metaDatum) {
+                self.telemetryMetadataById[objId][metaDatum.key] = metaDatum;
+                self.addGlobalMetadata(metaDatum);
+            });
+
+            self.subscriptionCache[objId] = {};
+            self.subscriptions[objId] = telemetryAPI.subscribe(obj, function (datum) {
+                self.handleSubscriptionCallback(objId, datum);
+            }, {});
+
+            /**
+             * if this is the initial load, parsing property types will be postponed
+             * until all composition objects have been loaded
+             */
+            if (self.loadComplete) {
+                self.parsePropertyTypes(obj);
+            }
+
+            self.eventEmitter.emit('add', obj);
+
+            $('.w-summary-widget').removeClass('s-status-no-data');
+        }
+    };
+
+    /**
+     * Invoked on a remove event in this Summary Widget's compostion. Removes
+     * the object from the local composition, and untracks it
+     * @param {object} identifier The identifier of the object to be removed
+     * @private
+     */
+    ConditionManager.prototype.onCompositionRemove = function (identifier) {
+        _.remove(this.domainObject.composition, function (id) {
+            return id.key === identifier.key;
+        });
+        delete this.compositionObjs[identifier.key];
+        this.subscriptions[identifier.key](); //unsubscribe from telemetry source
+        this.eventEmitter.emit('remove', identifier);
+
+        if (_.isEmpty(this.compositionObjs)) {
+            $('.w-summary-widget').addClass('s-status-no-data');
+        }
+    };
+
+    /**
+     * Invoked when the Summary Widget's composition finishes its initial load.
+     * Invokes any registered load callbacks, does a block load of all metadata,
+     * and then invokes any registered metadata load callbacks.
+     * @private
+     */
+    ConditionManager.prototype.onCompositionLoad = function () {
+        var self = this;
+        self.loadComplete = true;
+        self.eventEmitter.emit('load');
+        self.parseAllPropertyTypes().then(function () {
+            self.metadataLoadComplete = true;
+            self.eventEmitter.emit('metadata');
+        });
+    };
+
+    /**
+     * Returns the currently tracked telemetry sources
+     * @return {Object} An object mapping object keys to domain objects
+     */
+    ConditionManager.prototype.getComposition = function () {
+        return this.compositionObjs;
+    };
+
+    /**
+     * Get the human-readable name of a domain object from its key
+     * @param {string} id The key of the domain object
+     * @return {string} The human-readable name of the domain object
+     */
+    ConditionManager.prototype.getObjectName = function (id) {
+        var name;
+
+        if (this.keywordLabels[id]) {
+            name = this.keywordLabels[id];
+        } else if (this.compositionObjs[id]) {
+            name = this.compositionObjs[id].name;
+        }
+
+        return name;
+    };
+
+    /**
+     * Returns the property metadata associated with a given telemetry source
+     * @param {string} id The key associated with the domain object
+     * @return {Object} Returns an object with fields representing each telemetry field
+     */
+    ConditionManager.prototype.getTelemetryMetadata = function (id) {
+        return this.telemetryMetadataById[id];
+    };
+
+    /**
+     * Returns the type associated with a telemtry data field of a particular domain
+     * object
+     * @param {string} id The key associated with the domain object
+     * @param {string} property The telemetry field key to retrieve the type of
+     * @return {string} The type name
+     */
+    ConditionManager.prototype.getTelemetryPropertyType = function (id, property) {
+        if (this.telemetryTypesById[id]) {
+            return this.telemetryTypesById[id][property];
+        }
+    };
+
+    /**
+     * Returns the human-readable name of a telemtry data field of a particular domain
+     * object
+     * @param {string} id The key associated with the domain object
+     * @param {string} property The telemetry field key to retrieve the type of
+     * @return {string} The telemetry field name
+     */
+    ConditionManager.prototype.getTelemetryPropertyName = function (id, property) {
+        if (this.telemetryMetadataById[id] && this.telemetryMetadataById[id][property]) {
+            return this.telemetryMetadataById[id][property].name;
+        }
+    };
+
+    /**
+     * Returns the {ConditionEvaluator} instance associated with this condition
+     * manager
+     * @return {ConditionEvaluator}
+     */
+    ConditionManager.prototype.getEvaluator = function () {
+        return this.evaluator;
+    };
+
+    /**
+     * Returns true if the initial compostion load has completed
+     * @return {boolean}
+     */
+    ConditionManager.prototype.loadCompleted = function () {
+        return this.loadComplete;
+    };
+
+    /**
+     * Returns true if the initial block metadata load has completed
+     */
+    ConditionManager.prototype.metadataLoadCompleted = function () {
+        return this.metadataLoadComplete;
+    };
+
+    /**
+     * Triggers the telemetryRecieve callbacks registered to this ConditionManager,
+     * used by the {TestDataManager} to force a rule evaluation when test data is
+     * enabled
+     */
+    ConditionManager.prototype.triggerTelemetryCallback = function () {
+        this.eventEmitter.emit('receiveTelemetry');
+    };
+
+
+    /**
+     * Unsubscribe from all registered telemetry sources and unregister all event
+     * listeners registered with the Open MCT APIs
+     */
+    ConditionManager.prototype.destroy = function () {
+        Object.values(this.subscriptions).forEach(function (unsubscribeFunction) {
+            unsubscribeFunction();
+        });
+        this.composition.off('add', this.onCompositionAdd, this);
+        this.composition.off('remove', this.onCompositionRemove, this);
+        this.composition.off('load', this.onCompositionLoad, this);
+    };
+
+    return ConditionManager;
+});

src/plugins/summaryWidget/src/Rule.js

@@ -0,0 +1,480 @@
+define([
+    'text!../res/ruleTemplate.html',
+    './Condition',
+    './input/ColorPalette',
+    './input/IconPalette',
+    'EventEmitter',
+    'lodash',
+    'zepto'
+], function (
+    ruleTemplate,
+    Condition,
+    ColorPalette,
+    IconPalette,
+    EventEmitter,
+    _,
+    $
+) {
+
+    /**
+     * An object representing a summary widget rule. Maintains a set of text
+     * and css properties for output, and a set of conditions for configuring
+     * when the rule will be applied to the summary widget.
+     * @constructor
+     * @param {Object} ruleConfig A JavaScript object representing the configuration of this rule
+     * @param {Object} domainObject The Summary Widget domain object which contains this rule
+     * @param {MCT} openmct An MCT instance
+     * @param {ConditionManager} conditionManager A ConditionManager instance
+     * @param {WidgetDnD} widgetDnD A WidgetDnD instance to handle dragging and dropping rules
+     * @param {element} container The DOM element which cotains this summary widget
+     */
+    function Rule(ruleConfig, domainObject, openmct, conditionManager, widgetDnD, container) {
+        var self = this;
+
+        this.config = ruleConfig;
+        this.domainObject = domainObject;
+        this.openmct = openmct;
+        this.conditionManager = conditionManager;
+        this.widgetDnD = widgetDnD;
+        this.container = container;
+
+        this.domElement = $(ruleTemplate);
+        this.eventEmitter = new EventEmitter();
+        this.supportedCallbacks = ['remove', 'duplicate', 'change', 'conditionChange'];
+        this.conditions = [];
+        this.dragging = false;
+
+        this.remove = this.remove.bind(this);
+        this.duplicate = this.duplicate.bind(this);
+
+        this.thumbnail = $('.t-widget-thumb', this.domElement);
+        this.thumbnailLabel = $('.widget-label', this.domElement);
+        this.title = $('.rule-title', this.domElement);
+        this.description = $('.rule-description', this.domElement);
+        this.trigger = $('.t-trigger', this.domElement);
+        this.toggleConfigButton = $('.view-control', this.domElement);
+        this.configArea = $('.widget-rule-content', this.domElement);
+        this.grippy = $('.t-grippy', this.domElement);
+        this.conditionArea = $('.t-widget-rule-config', this.domElement);
+        this.jsConditionArea = $('.t-rule-js-condition-input-holder', this.domElement);
+        this.deleteButton = $('.t-delete', this.domElement);
+        this.duplicateButton = $('.t-duplicate', this.domElement);
+        this.addConditionButton = $('.add-condition', this.domElement);
+
+        /**
+         * The text inputs for this rule: any input included in this object will
+         * have the appropriate event handlers registered to it, and it's corresponding
+         * field in the domain object will be updated with its value
+         */
+        this.textInputs = {
+            name: $('.t-rule-name-input', this.domElement),
+            label: $('.t-rule-label-input', this.domElement),
+            message: $('.t-rule-message-input', this.domElement),
+            jsCondition: $('.t-rule-js-condition-input', this.domElement)
+        };
+
+        this.iconInput = new IconPalette('', container);
+        this.colorInputs = {
+            'background-color': new ColorPalette('icon-paint-bucket', container),
+            'border-color': new ColorPalette('icon-line-horz', container),
+            'color': new ColorPalette('icon-T', container)
+        };
+
+        this.colorInputs.color.toggleNullOption();
+
+        /**
+         * An onchange event handler method for this rule's icon palettes
+         * @param {string} icon The css class name corresponding to this icon
+         * @private
+         */
+        function onIconInput(icon) {
+            self.config.icon = icon;
+            self.updateDomainObject('icon', icon);
+            self.thumbnailLabel.removeClass().addClass('label widget-label ' + icon);
+            self.eventEmitter.emit('change');
+        }
+
+        /**
+         * An onchange event handler method for this rule's color palettes palettes
+         * @param {string} color The color selected in the palette
+         * @param {string} property The css property which this color corresponds to
+         * @private
+         */
+        function onColorInput(color, property) {
+            self.config.style[property] = color;
+            self.thumbnail.css(property, color);
+            self.eventEmitter.emit('change');
+        }
+
+        /**
+         * Parse input text from textbox to prevent HTML Injection
+         * @param {string} msg The text to be Parsed
+         * @private
+         */
+        function encodeMsg(msg) {
+            return $('<div />').text(msg).html();
+        }
+
+        /**
+         * An onchange event handler method for this rule's trigger key
+         * @param {event} event The change event from this rule's select element
+         * @private
+         */
+        function onTriggerInput(event) {
+            var elem = event.target;
+            self.config.trigger = encodeMsg(elem.value);
+            self.generateDescription();
+            self.updateDomainObject();
+            self.refreshConditions();
+            self.eventEmitter.emit('conditionChange');
+        }
+
+        /**
+         * An onchange event handler method for this rule's text inputs
+         * @param {element} elem The input element that generated the event
+         * @param {string} inputKey The field of this rule's configuration to update
+         * @private
+         */
+        function onTextInput(elem, inputKey) {
+            var text = encodeMsg(elem.value);
+            self.config[inputKey] = text;
+            self.updateDomainObject();
+            if (inputKey === 'name') {
+                self.title.html(text);
+            } else if (inputKey === 'label') {
+                self.thumbnailLabel.html(text);
+            }
+            self.eventEmitter.emit('change');
+        }
+
+        /**
+         * An onchange event handler for a mousedown event that initiates a drag gesture
+         * @param {event} event A mouseup event that was registered on this rule's grippy
+         * @private
+         */
+        function onDragStart(event) {
+            $('.t-drag-indicator').each(function () {
+                $(this).html($('.widget-rule-header', self.domElement).clone().get(0));
+            });
+            self.widgetDnD.setDragImage($('.widget-rule-header', self.domElement).clone().get(0));
+            self.widgetDnD.dragStart(self.config.id);
+            self.domElement.hide();
+        }
+        /**
+         * Show or hide this rule's configuration properties
+         * @private
+         */
+        function toggleConfig() {
+            self.configArea.toggleClass('expanded');
+            self.toggleConfigButton.toggleClass('expanded');
+            self.config.expanded = !self.config.expanded;
+        }
+
+        $('.t-rule-label-input', this.domElement).before(this.iconInput.getDOM());
+        this.iconInput.set(self.config.icon);
+        this.iconInput.on('change', function (value) {
+            onIconInput(value);
+        });
+
+        // Initialize thumbs when first loading
+        this.thumbnailLabel.removeClass().addClass('label widget-label ' + self.config.icon);
+        this.thumbnailLabel.html(self.config.label);
+
+        Object.keys(this.colorInputs).forEach(function (inputKey) {
+            var input = self.colorInputs[inputKey];
+
+            input.set(self.config.style[inputKey]);
+            onColorInput(self.config.style[inputKey], inputKey);
+
+            input.on('change', function (value) {
+                onColorInput(value, inputKey);
+                self.updateDomainObject();
+            });
+
+            $('.t-style-input', self.domElement).append(input.getDOM());
+        });
+
+        Object.keys(this.textInputs).forEach(function (inputKey) {
+            self.textInputs[inputKey].prop('value', self.config[inputKey] || '');
+            self.textInputs[inputKey].on('input', function () {
+                onTextInput(this, inputKey);
+            });
+        });
+
+        this.deleteButton.on('click', this.remove);
+        this.duplicateButton.on('click', this.duplicate);
+        this.addConditionButton.on('click', function () {
+            self.initCondition();
+        });
+        this.toggleConfigButton.on('click', toggleConfig);
+        this.trigger.on('change', onTriggerInput);
+
+        this.title.html(self.config.name);
+        this.description.html(self.config.description);
+        this.trigger.prop('value', self.config.trigger);
+
+        this.grippy.on('mousedown', onDragStart);
+        this.widgetDnD.on('drop', function () {
+            this.domElement.show();
+            $('.t-drag-indicator').hide();
+        }, this);
+
+        if (!this.conditionManager.loadCompleted()) {
+            this.config.expanded = false;
+        }
+
+        if (!this.config.expanded) {
+            this.configArea.removeClass('expanded');
+            this.toggleConfigButton.removeClass('expanded');
+        }
+
+        if (this.domainObject.configuration.ruleOrder.length === 2) {
+            $('.t-grippy', this.domElement).hide();
+        }
+
+        this.refreshConditions();
+
+        //if this is the default rule, hide elements that don't apply
+        if (this.config.id === 'default') {
+            $('.t-delete', this.domElement).hide();
+            $('.t-widget-rule-config', this.domElement).hide();
+            $('.t-grippy', this.domElement).hide();
+        }
+    }
+
+    /**
+     * Return the DOM element representing this rule
+     * @return {Element} A DOM element
+     */
+    Rule.prototype.getDOM = function () {
+        return this.domElement;
+    };
+
+    /**
+     * Unregister any event handlers registered with external sources
+     */
+    Rule.prototype.destroy = function () {
+        Object.values(this.colorInputs).forEach(function (palette) {
+            palette.destroy();
+        });
+        this.iconInput.destroy();
+    };
+
+    /**
+     * Register a callback with this rule: supported callbacks are remove, change,
+     * conditionChange, and duplicate
+     * @param {string} event The key for the event to listen to
+     * @param {function} callback The function that this rule will envoke on this event
+     * @param {Object} context A reference to a scope to use as the context for
+     *                         context for the callback function
+     */
+    Rule.prototype.on = function (event, callback, context) {
+        if (this.supportedCallbacks.includes(event)) {
+            this.eventEmitter.on(event, callback, context || this);
+        }
+    };
+
+    /**
+     * An event handler for when a condition's configuration is modified
+     * @param {} value
+     * @param {string} property The path in the configuration to updateDomainObject
+     * @param {number} index The index of the condition that initiated this change
+     */
+    Rule.prototype.onConditionChange = function (event) {
+        _.set(this.config.conditions[event.index], event.property, event.value);
+        this.generateDescription();
+        this.updateDomainObject();
+        this.eventEmitter.emit('conditionChange');
+    };
+
+    /**
+     * During a rule drag event, show the placeholder element after this rule
+     */
+    Rule.prototype.showDragIndicator = function () {
+        $('.t-drag-indicator').hide();
+        $('.t-drag-indicator', this.domElement).show();
+    };
+
+    /**
+     * Mutate thet domain object with this rule's local configuration
+     */
+    Rule.prototype.updateDomainObject = function () {
+        this.openmct.objects.mutate(this.domainObject, 'configuration.ruleConfigById.' +
+            this.config.id, this.config);
+    };
+
+    /**
+     * Get a property of this rule by key
+     * @param {string} prop They property key of this rule to get
+     * @return {} The queried property
+     */
+    Rule.prototype.getProperty = function (prop) {
+        return this.config[prop];
+    };
+
+    /**
+     * Remove this rule from the domain object's configuration and invoke any
+     * registered remove callbacks
+     */
+    Rule.prototype.remove = function () {
+        var ruleOrder = this.domainObject.configuration.ruleOrder,
+            ruleConfigById = this.domainObject.configuration.ruleConfigById,
+            self = this;
+
+        ruleConfigById[self.config.id] = undefined;
+        _.remove(ruleOrder, function (ruleId) {
+            return ruleId === self.config.id;
+        });
+
+        this.openmct.objects.mutate(this.domainObject, 'configuration.ruleConfigById', ruleConfigById);
+        this.openmct.objects.mutate(this.domainObject, 'configuration.ruleOrder', ruleOrder);
+        this.destroy();
+        this.eventEmitter.emit('remove');
+    };
+
+    /**
+     * Makes a deep clone of this rule's configuration, and calls the duplicate event
+     * callback with the cloned configuration as an argument if one has been registered
+     */
+    Rule.prototype.duplicate = function () {
+        var sourceRule = JSON.parse(JSON.stringify(this.config));
+        sourceRule.expanded = true;
+        this.eventEmitter.emit('duplicate', sourceRule);
+    };
+
+    /**
+     * Initialze a new condition. If called with the sourceConfig and sourceIndex arguments,
+     * will insert a new condition with the provided configuration after the sourceIndex
+     * index. Otherwise, initializes a new blank rule and inserts it at the end
+     * of the list.
+     * @param {Object} [config] The configuration to initialize this rule from,
+     *                          consisting of sourceCondition and index fields
+     */
+    Rule.prototype.initCondition = function (config) {
+        var ruleConfigById = this.domainObject.configuration.ruleConfigById,
+            newConfig,
+            sourceIndex = config && config.index,
+            defaultConfig = {
+                object: '',
+                key: '',
+                operation: '',
+                values: []
+            };
+
+        newConfig = (config !== undefined ? config.sourceCondition : defaultConfig);
+        if (sourceIndex !== undefined) {
+            ruleConfigById[this.config.id].conditions.splice(sourceIndex + 1, 0, newConfig);
+        } else {
+            ruleConfigById[this.config.id].conditions.push(newConfig);
+        }
+        this.domainObject.configuration.ruleConfigById = ruleConfigById;
+        this.updateDomainObject();
+        this.refreshConditions();
+        this.generateDescription();
+    };
+
+    /**
+     * Build {Condition} objects from configuration and rebuild associated view
+     */
+    Rule.prototype.refreshConditions = function () {
+        var self = this,
+            $condition = null,
+            loopCnt = 0,
+            triggerContextStr = self.config.trigger === 'any' ? ' or ' : ' and ';
+
+        self.conditions = [];
+        $('.t-condition', this.domElement).remove();
+
+        this.config.conditions.forEach(function (condition, index) {
+            var newCondition = new Condition(condition, index, self.conditionManager);
+            newCondition.on('remove', self.removeCondition, self);
+            newCondition.on('duplicate', self.initCondition, self);
+            newCondition.on('change', self.onConditionChange, self);
+            self.conditions.push(newCondition);
+        });
+
+        if (this.config.trigger === 'js') {
+            this.jsConditionArea.show();
+            this.addConditionButton.hide();
+        } else {
+            this.jsConditionArea.hide();
+            this.addConditionButton.show();
+            self.conditions.forEach(function (condition) {
+                $condition = condition.getDOM();
+                $('li:last-of-type', self.conditionArea).before($condition);
+                if (loopCnt > 0) {
+                    $('.t-condition-context', $condition).html(triggerContextStr + ' when');
+                }
+                loopCnt++;
+            });
+        }
+
+        if (self.conditions.length === 1) {
+            self.conditions[0].hideButtons();
+        }
+
+    };
+
+    /**
+     * Remove a condition from this rule's configuration at the given index
+     * @param {number} removeIndex The index of the condition to remove
+     */
+    Rule.prototype.removeCondition = function (removeIndex) {
+        var ruleConfigById = this.domainObject.configuration.ruleConfigById,
+            conditions = ruleConfigById[this.config.id].conditions;
+
+        _.remove(conditions, function (condition, index) {
+            return index === removeIndex;
+        });
+
+        this.domainObject.configuration.ruleConfigById[this.config.id] = this.config;
+        this.updateDomainObject();
+        this.refreshConditions();
+        this.generateDescription();
+        this.eventEmitter.emit('conditionChange');
+    };
+
+    /**
+     * Build a human-readable description from this rule's conditions
+     */
+    Rule.prototype.generateDescription = function () {
+        var description = '',
+            manager = this.conditionManager,
+            evaluator = manager.getEvaluator(),
+            name,
+            property,
+            operation,
+            self = this;
+
+        if (this.config.conditions && this.config.id !== 'default') {
+            if (self.config.trigger === 'js') {
+                description = 'when a custom JavaScript condition evaluates to true';
+            } else {
+                this.config.conditions.forEach(function (condition, index) {
+                    name = manager.getObjectName(condition.object);
+                    property = manager.getTelemetryPropertyName(condition.object, condition.key);
+                    operation = evaluator.getOperationDescription(condition.operation, condition.values);
+                    if (name || property || operation) {
+                        description += 'when ' +
+                            (name ? name + '\'s ' : '') +
+                            (property ? property + ' ' : '') +
+                            (operation ? operation + ' ' : '') +
+                            (self.config.trigger === 'any' ? ' OR ' : ' AND ');
+                    }
+                });
+            }
+        }
+
+        if (description.endsWith('OR ')) {
+            description = description.substring(0, description.length - 3);
+        }
+        if (description.endsWith('AND ')) {
+            description = description.substring(0, description.length - 4);
+        }
+        description = (description === '' ? this.config.description : description);
+        this.description.html(description);
+        this.config.description = description;
+    };
+
+    return Rule;
+});