Edit mode button works

open #198
Minor tweak to placeholder init content;

.gitignore

@@ -28,5 +28,3 @@ node_modules
 # Protractor logs
 protractor/logs
 
-# npm-debug log
-npm-debug.log

CONTRIBUTING.md

@@ -291,7 +291,7 @@ checklist.)
 1. Changes address original issue?
 2. Unit tests included and/or updated with changes?
 3. Command line build passes?
-4. Changes have been smoke-tested?
+4. Expect to pass code review?
 
 ### Reviewer Checklist
 

LICENSES.md

@@ -345,41 +345,6 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 ---
 
-### moment-duration-format
-
-#### Info
-
-* Link: https://github.com/jsmreese/moment-duration-format
-
-* Version: 1.3.0
-
-* Authors: John Madhavan-Reese
-
-* Description: Duration parsing/formatting
-
-#### License
-
-Copyright 2014 John Madhavan-Reese
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all
-copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
----
-
 ### Json.NET
 
 #### Info

Procfile

@@ -1 +1 @@
-web: node app.js --port $PORT
+web: node app.js --port $PORT --include example/localstorage

bundles.json

@@ -6,32 +6,26 @@
     "platform/commonUI/browse",
     "platform/commonUI/edit",
     "platform/commonUI/dialog",
-    "platform/commonUI/formats",
     "platform/commonUI/general",
     "platform/commonUI/inspect",
     "platform/commonUI/mobile",
     "platform/commonUI/themes/espresso",
-    "platform/commonUI/notification",
     "platform/containment",
     "platform/execution",
     "platform/telemetry",
-    "platform/features/clock",
-    "platform/features/events",
     "platform/features/imagery",
     "platform/features/layout",
     "platform/features/pages",
     "platform/features/plot",
     "platform/features/scrolling",
-    "platform/features/timeline",
+    "platform/features/events",
     "platform/forms",
     "platform/identity",
-    "platform/persistence/aggregator",
     "platform/persistence/local",
     "platform/persistence/queue",
     "platform/policy",
     "platform/entanglement",
     "platform/search",
-    "platform/status",
 
     "example/imagery",
     "example/eventGenerator",

docs/footer.html

@@ -1,9 +0,0 @@
-        <hr>
-        <cite>
-            This document is styled using
-            <a href="https://github.com/jasonm23/markdown-css-themes">
-                https://github.com/jasonm23/markdown-css-themes
-            </a>.
-        </cite>
-    </body>
-</html>

docs/gendocs.js

@@ -20,7 +20,7 @@
  * at runtime from the About dialog for additional information.
  *****************************************************************************/
 
-/*global require,process,__dirname,GLOBAL*/
+/*global require,process,GLOBAL*/
 /*jslint nomen: false */
 
 
@@ -30,8 +30,7 @@
 var CONSTANTS = {
         DIAGRAM_WIDTH: 800,
         DIAGRAM_HEIGHT: 500
-    },
-    TOC_HEAD = "# Table of Contents";
+    };
 
 GLOBAL.window = GLOBAL.window ||  GLOBAL; // nomnoml expects window to be defined
 (function () {
@@ -45,10 +44,7 @@ GLOBAL.window = GLOBAL.window ||  GLOBAL; // nomnoml expects window to be define
         split = require("split"),
         stream = require("stream"),
         nomnoml = require('nomnoml'),
-        toc = require("markdown-toc"),
         Canvas = require('canvas'),
-        header = fs.readFileSync(path.resolve(__dirname, 'header.html')),
-        footer = fs.readFileSync(path.resolve(__dirname, 'footer.html')),
         options = require("minimist")(process.argv.slice(2));
 
     // Convert from nomnoml source to a target PNG file.
@@ -106,7 +102,7 @@ GLOBAL.window = GLOBAL.window ||  GLOBAL; // nomnoml expects window to be define
     }
 
     // Convert from Github-flavored Markdown to HTML
-    function gfmifier(renderTOC) {
+    function gfmifier() {
         var transform = new stream.Transform({ objectMode: true }),
             markdown = "";
         transform._transform = function (chunk, encoding, done) {
@@ -114,14 +110,9 @@ GLOBAL.window = GLOBAL.window ||  GLOBAL; // nomnoml expects window to be define
             done();
         };
         transform._flush = function (done) {
-            if (renderTOC){
-                // Prepend table of contents
-                markdown =
-                    [ TOC_HEAD, toc(markdown).content, "", markdown ].join("\n");
-            }
-            this.push(header);
+            this.push("<html><body>\n");
             this.push(marked(markdown));
-            this.push(footer);
+            this.push("\n</body></html>\n");
             done();
         };
         return transform;
@@ -142,8 +133,8 @@ GLOBAL.window = GLOBAL.window ||  GLOBAL; // nomnoml expects window to be define
         customRenderer.link = function (href, title, text) {
             // ...but only if they look like relative paths
             return (href || "").indexOf(":") === -1 && href[0] !== "/" ?
-                    renderer.link(href.replace(/\.md/, ".html"), title, text) :
-                    renderer.link.apply(renderer, arguments);
+                renderer.link(href.replace(/\.md/, ".html"), title, text) :
+                renderer.link.apply(renderer, arguments);
         };
         return customRenderer;
     }
@@ -170,16 +161,13 @@ GLOBAL.window = GLOBAL.window ||  GLOBAL; // nomnoml expects window to be define
             var destination = file.replace(options['in'], options.out)
                 .replace(/md$/, "html"),
                 destPath = path.dirname(destination),
-                prefix = path.basename(destination).replace(/\.html$/, ""),
-                //Determine whether TOC should be rendered for this file based
-                //on regex provided as command line option
-                renderTOC = file.match(options['suppress-toc'] || "") === null;
+                prefix = path.basename(destination).replace(/\.html$/, "");
 
             mkdirp(destPath, function (err) {
                 fs.createReadStream(file, { encoding: 'utf8' })
                     .pipe(split())
                     .pipe(nomnomlifier(destPath, prefix))
-                    .pipe(gfmifier(renderTOC))
+                    .pipe(gfmifier())
                     .pipe(fs.createWriteStream(destination, {
                         encoding: 'utf8'
                     }));
@@ -191,17 +179,13 @@ GLOBAL.window = GLOBAL.window ||  GLOBAL; // nomnoml expects window to be define
     glob(options['in'] + "/**/*.@(html|css|png)", {}, function (err, files) {
         files.forEach(function (file) {
             var destination = file.replace(options['in'], options.out),
-                destPath = path.dirname(destination),
-                streamOptions = {};
-            if (file.match(/png$/)) {
-                streamOptions.encoding = null;
-            } else {
-                streamOptions.encoding = 'utf8';
-            }
+                destPath = path.dirname(destination);
 
             mkdirp(destPath, function (err) {
-                fs.createReadStream(file, streamOptions)
-                    .pipe(fs.createWriteStream(destination, streamOptions));
+                fs.createReadStream(file, { encoding: 'utf8' })
+                    .pipe(fs.createWriteStream(destination, {
+                        encoding: 'utf8'
+                    }));
             });
         });
     });

docs/header.html

@@ -1,7 +0,0 @@
-<html>
-    <head>
-        <link rel="stylesheet"
-              href="http://jasonm23.github.io/markdown-css-themes/avenir-white.css">
-    </head>
-    <body>
-

docs/src/architecture/Platform.md

@@ -35,26 +35,16 @@ in __any of these tiers__.
 * _DOM_: The rendered HTML document, composed from HTML templates which
   have been processed by AngularJS and will be updated by AngularJS
   to reflect changes from the presentation layer. User interactions
-  are initiated from here and invoke behavior in the presentation layer. HTML 
-  templates are written in Angular’s template syntax; see the [Angular documentation on templates](https://docs.angularjs.org/guide/templates)​. 
-  These describe the page as actually seen by the user. Conceptually, 
-  stylesheets (controlling the look­and­feel of the rendered templates) belong 
-  in this grouping as well. 
+  are initiated from here and invoke behavior in the presentation layer.
 * [_Presentation layer_](#presentation-layer): The presentation layer
   is responsible for updating (and providing information to update)
   the displayed state of the application. The presentation layer consists
   primarily of _controllers_ and _directives_. The presentation layer is
   concerned with inspecting the information model and preparing it for
   display.
-* [_Information model_](#information-model): ​Provides a common (within Open MCT 
-  Web) set of interfaces for dealing with “things” ­ domain objects ­ within the 
-  system. User­facing concerns in a Open MCT Web application are expressed as 
-  domain objects; examples include folders (used to organize other domain 
-  objects), layouts (used to build displays), or telemetry points (used as 
-  handles for streams of remote measurements.) These domain objects expose a 
-  common set of interfaces to allow reusable user interfaces to be built in the 
-  presentation and template tiers; the specifics of these behaviors are then 
-  mapped to interactions with underlying services. 
+* [_Information model_](#information-model): The information model
+  describes the state and behavior of the objects with which the user
+  interacts.
 * [_Service infrastructure_](#service-infrastructure): The service
   infrastructure is responsible for providing the underlying general
   functionality needed to support the information model. This includes
@@ -62,9 +52,7 @@ in __any of these tiers__.
   back-end.
 * _Back-end_: The back-end is out of the scope of Open MCT Web, except
   for the interfaces which are utilized by adapters participating in the
-  service infrastructure. Includes the underlying persistence stores, telemetry 
-  streams, and so forth which the Open MCT Web client is being used to interact 
-  with.
+  service infrastructure.
 
 ## Application Start-up
 

docs/src/architecture/index.md

@@ -58,13 +58,13 @@ of the software.
 
 These layers are:
 
-* [_Framework_](framework.md): The framework layer is responsible for
+* [_Framework_](Framework.md): The framework layer is responsible for
   managing the interactions between application components. It has no
   application-specific knowledge; at this layer, we have only
   established an abstraction by which different software components
   may communicate and/or interact.
-* [_Platform_](platform.md): The platform layer defines the general look, 
-  feel, and behavior of Open MCT Web. This includes user-facing components like
+* [_Platform_](Platform.md): The platform layer defines the general look, feel, and
+  behavior of Open MCT Web. This includes user-facing components like
   Browse mode and Edit mode, as well as underlying elements of the
   information model and the general service infrastructure.
 * _Application_: The application layer defines specific features of

docs/src/index.html

@@ -19,7 +19,18 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<mct-container key="overlay" class="t-message-single">
-    <mct-include key="'message'" ng-model="ngModel">
-    </mct-include>
-</mct-container>
+<!DOCTYPE html>
+<html>
+<head lang="en">
+    <meta charset="UTF-8">
+    <title>Open MCT Web Documentation</title>
+</head>
+<body class="user-environ" ng-view>
+    Sections:
+    <ul>
+        <li><a href="api/">API</a></li>
+        <li><a href="guide/">Developer Guide</a></li>
+        <li><a href="architecture/">Architecture Overview</a></li>
+    </ul>
+</body>
+</html>

docs/src/index.md

@@ -1,35 +0,0 @@
-# Open MCT Web Documentation
-
-## Overview
-
- Documentation is provided to support the use and development of
- Open MCT Web. It's recommended that before doing
- any development with Open MCT Web you take some time to familiarize yourself 
- with the documentation below.
-
- Open MCT Web provides functionality out of the box, but it's also a platform for
- building rich mission operations applications based on modern web technology. 
- The platform is configured declaratively, and defines conventions for
- building on the provided capabilities by creating modular 'bundles' that 
- extend the platform at a variety of extension points. The details of how to
- extend the platform are provided in the following documentation.
-
-## Sections
-
- * The [Architecture Overview](architecture/) describes the concepts used 
- throughout Open MCT Web, and gives a high level overview of the platform's design.
- 
- * The [Developer's Guide](guide/) goes into more detail about how to use the
- platform and the functionality that it provides.
- 
- * The [Tutorials](tutorials/) give examples of extending the platform to add 
- functionality, 
- and integrate with data sources.
- 
- * The [API](api/) document is generated from inline documentation 
- using [JSDoc](http://usejsdoc.org/), and describes the JavaScript objects and
- functions that make up the software platform.
-
- * Finally, the [Development Process](process/) document describes the 
- Open MCT Web software development cycle.
- 

docs/src/process/cycle.md

@@ -1,161 +0,0 @@
-# Development Cycle
-
-Development of Open MCT Web occurs on an iterative cycle of
-sprints and releases.
-
-* A _sprint_ is three weeks in duration, and represents a
-  set of improvements that can be completed and tested by the
-  development team. Software at the end of the sprint is
-  "semi-stable"; it will have undergone reduced testing and may carry
-  defects or usability issues of lower severity, particularly if
-  there are workarounds.
-* A _release_ occurs every four sprints. Releases are stable, and
-  will have undergone full acceptance testing to ensure that the
-  software behaves correctly and usably.
-
-## Roles
-
-The sprint process assumes the presence of a __project manager.__
-The project manager is responsible for
-making tactical decisions about what development work will be
-performed, and for coordinating with stakeholders to arrive at
-higher-level strategic decisions about desired functionality
-and characteristics of the software, major external milestones,
-and so forth.
-
-In the absence of a dedicated project manager, this role may be rotated
-among members of the development team on a per-sprint basis.
-
-Responsibilities of the project manager including:
-
-* Maintaining (with agreement of stakeholders) a "road map" of work
-  planned for future releases/sprints; this should be higher-level,
-  usually expressed as "themes",
-  with just enough specificity to gauge feasibility of plans,
-  relate work back to milestones, and identify longer-term
-  dependencies.
-* Determining (with assistance from the rest of the team) which
-  issues to work on in a given sprint and how they shall be
-  assigned.
-* Pre-planning subsequent sprints to ensure that all members of the
-  team always have a clear direction.
-* Scheduling and/or ensuring adherence to
-  [process points](#process-points).
-* Responding to changes within the sprint (shifting priorities,
-  new issues) and re-allocating work for the sprint as needed.
-
-## Sprint Calendar
-
-Certain [process points](#process-points) are regularly scheduled in
-the sprint cycle.
-
-### Sprints by Release
-
-Allocation of work among sprints should be planned relative to release
-goals and milestones. As a general guideline, higher-risk work (large
-new features which may carry new defects, major refactoring, design
-changes with uncertain effects on usability) should be allocated to
-earlier sprints, allowing for time in later sprints to ensure stability.
-
-| Sprint | Focus                                                   |
-|:------:|:--------------------------------------------------------|
-| __1__  | Prototyping, design, experimentation.                   |
-| __2__  | New features, refinements, enhancements.                |
-| __3__  | Feature completion, low-risk enhancements, bug fixing.  |
-| __4__  | Stability & quality assurance.                          |
-
-### Sprints 1-3
-
-The first three sprints of a release are primarily centered around
-development work, with regular acceptance testing in the third
-week. During this third week, the top priority should be passing
-acceptance testing (e.g. by resolving any blockers found); any
-resources not needed for this effort should be used to begin work
-for the subsequent sprint.
-
-| Week  | Mon                       | Tue    | Wed | Thu                          | Fri         |
-|:-----:|:-------------------------:|:------:|:---:|:----------------------------:|:-----------:|
-| __1__ | Sprint plan               | Tag-up |     |                              |             |
-| __2__ |                           | Tag-up |     |                              | Code freeze |
-| __3__ | Per-sprint testing        | Triage |     | _Per-sprint testing*_        | Ship        |
-
-* If necessary.
-
-### Sprint 4
-
-The software must be stable at the end of the fourth sprint; because of
-this, the fourth sprint is scheduled differently, with a heightened
-emphasis on testing.
-
-| Week   | Mon                       | Tue    | Wed | Thu                          | Fri         |
-|-------:|:-------------------------:|:------:|:---:|:----------------------------:|:-----------:|
-| __1__  | Sprint plan               | Tag-up |     |                              | Code freeze |
-| __2__  | Per-release testing       | Triage |     |                              |             |
-| __3__  | _Per-release testing*_    | Triage |     | _Per-release testing*_       | Ship        |
-
-* If necessary.
-
-## Process Points
-
-* __Sprint plan.__ Project manager allocates issues based on
-  theme(s) for sprint, then reviews with team. Each team member
-  should have roughly two weeks of work allocated (to allow time
-  in the third week for testing of work completed.)
-  * Project manager should also sketch out subsequent sprint so
-    that team may begin work for that sprint during the
-    third week, since testing and blocker resolution is unlikely
-    to require all available resources.
-* __Tag-up.__ Check in and status update among development team.
-  May amend plan for sprint as-needed.
-* __Code freeze.__ Any new work from this sprint
-  (features, bug fixes, enhancements) must be integrated by the
-  end of the second week of the sprint. After code freeze
-  (and until the end of the sprint) the only changes that should be
-  merged into the master branch should directly address issues
-  needed to pass acceptance testing.
-* [__Per-release Testing.__](testing/plan.md#per-release-testing)
-  Structured testing with predefined
-  success criteria. No release should ship without passing
-  acceptance tests. Time is allocated in each sprint for subsequent
-  rounds of acceptance testing if issues are identified during a
-  prior round. Specific details of acceptance testing need to be
-  agreed-upon with relevant stakeholders and delivery recipients,
-  and should be flexible enough to allow changes to plans
-  (e.g. deferring delivery of some feature in order to ensure
-  stability of other features.) Baseline testing includes:
-  * [__Testathon.__](testing/plan.md#user-testing)
-    Multi-user testing, involving as many users as
-    is feasible, plus development team. Open-ended; should verify
-    completed work from this sprint, test exploratorily for
-    regressions, et cetera.
-  * [__Long-Duration Test.__](testing/plan.md#long-duration-testing) A
-    test to verify that the software remains
-    stable after running for longer durations. May include some
-    combination of automated testing and user verification (e.g.
-    checking to verify that software remains subjectively
-    responsive at conclusion of test.)
-  * [__Unit Testing.__](testing/plan.md#unit-testing)
-    Automated testing integrated into the
-    build. (These tests are verified to pass more often than once
-    per sprint, as they run before any merge to master, but still
-    play an important role in per-release testing.)
-* [__Per-sprint Testing.__](testing/plan.md#per-sprint-testing)
-  Subset of Pre-release Testing
-  which should be performed before shipping at the end of any
-  sprint. Time is allocated for a second round of
-  Pre-release Testing if the first round is not passed.
-* __Triage.__ Team reviews issues from acceptance testing and uses
-  success criteria to determine whether or not they should block
-  release, then formulates a plan to address these issues before
-  the next round of acceptance testing. Focus here should be on
-  ensuring software passes that testing in order to ship on time;
-  may prefer to disable malfunctioning components and fix them
-  in a subsequent sprint, for example.
-* __Ship.__ Tag a code snapshot that has passed acceptance
-  testing and deploy that version. (Only true if acceptance
-  testing has passed by this point; if acceptance testing has not
-  been passed, will need to make ad hoc decisions with stakeholders,
-  e.g. "extend the sprint" or "defer shipment until end of next
-  sprint.")
-
-

docs/src/process/index.md

@@ -1,13 +0,0 @@
-# Development Process
-
-The process used to develop Open MCT Web is described in the following
-documents:
-
-* [Development Cycle](cycle.md): Describes how and when specific
-  process points are repeated during development.
-* Testing is described in two documents:
-  * The [Test Plan](testing/plan.md) summarizes the approaches used
-    to test Open MCT Web.
-  * The [Test Procedures](testing/procedures.md) document what
-    specific tests are performed to verify correctness, and how
-    they should be carried out.

docs/src/process/testing/plan.md

@@ -1,127 +0,0 @@
-# Test Plan
-
-## Test Levels
-
-Testing for Open MCT Web includes:
-
-* _Smoke testing_: Brief, informal testing to verify that no major issues
-  or regressions are present in the software, or in specific features of
-  the software.
-* _Unit testing_: Automated verification of the performance of individual
-  software components.
-* _User testing_: Testing with a representative user base to verify
-  that application behaves usably and as specified.
-* _Long-duration testing_: Testing which takes place over a long period
-  of time to detect issues which are not readily noticeable during
-  shorter test periods.
-
-### Smoke Testing
-
-Manual, non-rigorous testing of the software and/or specific features
-of interest. Verifies that the software runs and that basic functionality
-is present.
-
-### Unit Testing
-
-Unit tests are automated tests which exercise individual software
-components. Tests are subject to code review along with the actual
-implementation, to ensure that tests are applicable and useful.
-
-Unit tests should meet
-[test standards](https://github.com/nasa/openmctweb/blob/master/CONTRIBUTING.md#test-standards)
-as described in the contributing guide.
-
-### User Testing
-
-User testing is performed at scheduled times involving target users
-of the software or reasonable representatives, along with members of
-the development team exercising known use cases. Users test the
-software directly; the software should be configured as similarly to
-its planned production configuration as is feasible without introducing
-other risks (e.g. damage to data in a production instance.)
-
-User testing will focus on the following activities:
-
-* Verifying issues resolved since the last test session.
-* Checking for regressions in areas related to recent changes.
-* Using major or important features of the software,
-  as determined by the user.
-* General "trying to break things."
-
-During user testing, users will
-[report issues](https://github.com/nasa/openmctweb/blob/master/CONTRIBUTING.md#issue-reporting)
-as they are encountered.
-
-Desired outcomes of user testing are:
-
-* Identified software defects.
-* Areas for usability improvement.
-* Feature requests (particularly missed requirements.)
-* Recorded issue verification.
-
-### Long-duration Testing
-
-Long-duration testing occurs over a twenty-four hour period. The
-software is run in one or more stressing cases representative of expected
-usage. After twenty-four hours, the software is evaluated for:
-
-* Performance metrics: Have memory usage or CPU utilization increased
-  during this time period in unexpected or undesirable ways?
-* Subjective usability: Does the software behave in the same way it did
-  at the start of the test? Is it as responsive?
-
-Any defects or unexpected behavior identified during testing should be
-[reported as issues](https://github.com/nasa/openmctweb/blob/master/CONTRIBUTING.md#issue-reporting)
-and reviewed for severity.
-
-## Test Performance
-
-Tests are performed at various levels of frequency.
-
-* _Per-merge_: Performed before any new changes are integrated into
-  the software.
-* _Per-sprint_: Performed at the end of every [sprint](../cycle.md).
-* _Per-release_: Performed at the end of every [release](../cycle.md).
-
-### Per-merge Testing
-
-Before changes are merged, the author of the changes must perform:
-
-* _Smoke testing_ (both generally, and for areas which interact with
-  the new changes.)
-* _Unit testing_ (as part of the automated build step.)
-
-Changes are not merged until the author has affirmed that both
-forms of testing have been performed successfully; this is documented
-by the [Author Checklist](https://github.com/nasa/openmctweb/blob/master/CONTRIBUTING.md#author-checklist).
-
-### Per-sprint Testing
-
-Before a sprint is closed, the development team must additionally
-perform:
-
-* A relevant subset of [_user testing_](procedures.md#user-test-procedures)
-  identified by the acting [project manager](../cycle.md#roles).
-* [_Long-duration testing_](procedures.md#long-duration-testng)
-  (specifically, for 24 hours.)
-
-Issues are reported as a product of both forms of testing.
-
-A sprint is not closed until both categories have been performed on
-the latest snapshot of the software, _and_ no issues labelled as
-["blocker"](https://github.com/nasa/openmctweb/blob/master/CONTRIBUTING.md#issue-reporting)
-remain open.
-
-### Per-release Testing
-
-As [per-sprint testing](#per-sprint-testing), except that _user testing_
-should cover all test cases, with less focus on changes from the specific
-sprint or release.
-
-Per-release testing should also include any acceptance testing steps
-agreed upon with recipients of the software.
-
-A release is not closed until both categories have been performed on
-the latest snapshot of the software, _and_ no issues labelled as
-["blocker" or "critical"](https://github.com/nasa/openmctweb/blob/master/CONTRIBUTING.md#issue-reporting)
-remain open.

docs/src/process/testing/procedures.md

@@ -1,169 +0,0 @@
-# Test Procedures
-
-## Introduction
-
-This document is intended to be used:
-
-* By testers, to verify that Open MCT Web behaves as specified.
-* By the development team, to document new test cases and to provide
-  guidance on how to author these.
-
-## Writing Procedures
-
-### Template
-
-Procedures for individual tests should use the following template,
-adapted from [https://swehb.nasa.gov/display/7150/SWE-114]().
-
-Property       | Value
----------------|---------------------------------------------------------------
-Test ID        |
-Relevant reqs. |
-Prerequisites  |
-Test input     |
-Instructions   |
-Expectation    |
-Eval. criteria |
-
-For multi-line descriptions, use an asterisk or similar indicator to refer
-to a longer-form description below.
-
-#### Example Procedure - Edit a Layout
-
-Property       | Value
----------------|---------------------------------------------------------------
-Test ID        | MCT-TEST-000X - Edit a layout
-Relevant reqs. | MCT-EDIT-000Y
-Prerequisites  | Create a layout, as in MCT-TEST-000Z
-Test input     | Domain object database XYZ
-Instructions   | See below *
-Expectation    | Change to editing context †
-Eval. criteria | Visual inspection
-
-* Follow the following steps:
-
-1. Verify that the created layout is currently navigated-to,
-   as in MCT-TEST-00ZZ.
-2. Click the Edit button, identified by a pencil icon and the text "Edit"
-   displayed on hover.
-
-† Right-hand viewing area should be surrounded by a dashed
-blue border when a domain object is being edited.
-
-### Guidelines
-
-Test procedures should be written assuming minimal prior knowledge of the
-application: Non-standard terms should only be used when they are documented
-in [the glossary](#glossary), and shorthands used for user actions should
-be accompanied by useful references to test procedures describing those
-actions (when available) or descriptions in user documentation.
-
-Test cases should be narrow in scope; if a list of steps is excessively
-long (or must be written vaguely to be kept short) it should be broken
-down into multiple tests which reference one another.
-
-All requirements satisfied by Open MCT Web should be verifiable using
-one or more test procedures.
-
-## Glossary
-
-This section will contain terms used in test procedures. This may link to
-a common glossary, to avoid replication of content.
-
-## Procedures
-
-This section will contain specific test procedures. Presently, procedures
-are placeholders describing general patterns for setting up and conducting
-testing.
-
-### User Testing Setup
-
-These procedures describes a general pattern for setting up for user
-testing. Specific deployments should customize this pattern with
-relevant data and any additional steps necessary.
-
-Property       | Value
----------------|---------------------------------------------------------------
-Test ID        | MCT-TEST-SETUP0 - User Testing Setup
-Relevant reqs. | TBD
-Prerequisites  | Build of relevant components
-Test input     | Exemplary database; exemplary telemetry data set
-Instructions   | See below
-Expectation    | Able to load application in a web browser (Google Chrome)
-Eval. criteria | Visual inspection
-
-Instructions:
-
-1. Start telemetry server.
-2. Start ElasticSearch.
-3. Restore database snapshot to ElasticSearch.
-4. Start telemetry playback.
-5. Start HTTP server for client sources.
-
-### User Test Procedures
-
-Specific user test cases have not yet been authored. In their absence,
-user testing is conducted by:
-
-* Reviewing the text of issues from the issue tracker to understand the
-  desired behavior, and exercising this behavior in the running application.
-  (For instance, by following steps to reproduce from the original issue.)
-  * Issues which appear to be resolved should be marked as such with comments
-    on the original issue (e.g. "verified during user testing MM/DD/YYYY".)
-  * Issues which appear not to have been resolved should be reopened with an
-    explanation of what unexpected behavior has been observed.
-  * In cases where an issue appears resolved as-worded but other related
-    undesirable behavior is observed during testing, a new issue should be
-    opened, and linked to from a comment in the original issues.
-* General usage of new features and/or existing features which have undergone
-  recent changes. Defects or problems with usability should be documented
-  by filing issues in the issue tracker.
-* Open-ended testing to discover defects, identify usability issues, and
-  generate feature requests.
-
-### Long-Duration Testing
-
-The purpose of long-duration testing is to identify performance issues
-and/or other defects which are sensitive to the amount of time the
-application is kept running. (Memory leaks, for instance.)
-
-Property       | Value
----------------|---------------------------------------------------------------
-Test ID        | MCT-TEST-LDT0 - Long-duration Testing
-Relevant reqs. | TBD
-Prerequisites  | MCT-TEST-SETUP0
-Test input     | (As for test setup.)
-Instructions   | See "Instructions" below *
-Expectation    | See "Expectations" below †
-Eval. criteria | Visual inspection
-
-* Instructions:
-
-1. Start `top` or a similar tool to measure CPU usage and memory utilization.
-2. Open several user-created displays (as many as would be realistically
-   opened during actual usage in a stressing case) in some combination of
-   separate tabs and windows (approximately as many tabs-per-window as
-   total windows.)
-3. Ensure that playback data is set to run continuously for at least 24 hours
-   (e.g. on a loop.)
-4. Record CPU usage and memory utilization.
-5. In at least one tab, try some general user interface gestures and make
-   notes about the subjective experience of using the application. (Particularly,
-   the degree of responsiveness.)
-6. Leave client displays open for 24 hours.
-7. Record CPU usage and memory utilization again.
-8. Make additional notes about the subjective experience of using the
-   application (again, particularly responsiveness.)
-9. Check logs for any unexpected warnings or errors.
-
-† Expectations:
-
-* At the end of the test, CPU usage and memory usage should both be similar
-  to their levels at the start of the test.
-* At the end of the test, subjective usage of the application should not
-  be observably different from the way it was at the start of the test.
-  (In particular, responsiveness should not decrease.)
-* Logs should not contain any unexpected warnings or errors ("expected"
-  warnings or errors are those that have been documented and prioritized
-  as known issues, or those that are explained by transient conditions
-  external to the software, such as network outages.)

example/generator/bundle.json

@@ -16,23 +16,6 @@
                 "implementation": "SinewaveLimitCapability.js"
             }
         ],
-        "formats": [
-            {
-                "key": "example.delta",
-                "implementation": "SinewaveDeltaFormat.js"
-            }
-        ],
-        "constants": [
-            {
-                "key": "TIME_CONDUCTOR_DOMAINS",
-                "value": [
-                    { "key": "time", "name": "Time" },
-                    { "key": "yesterday", "name": "Yesterday" },
-                    { "key": "delta", "name": "Delta", "format": "example.delta" }
-                ],
-                "priority": -1
-            }
-        ],
         "types": [
             {
                 "key": "generator",
@@ -55,11 +38,6 @@
                         {
                             "key": "yesterday",
                             "name": "Yesterday"
-                        },
-                        {
-                            "key": "delta",
-                            "name": "Delta",
-                            "format": "example.delta"
                         }
                     ],
                     "ranges": [

example/generator/src/SinewaveDeltaFormat.js

@@ -1,68 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define,Promise*/
-
-define(
-    ['./SinewaveConstants', 'moment'],
-    function (SinewaveConstants, moment) {
-        "use strict";
-
-        var START_TIME = SinewaveConstants.START_TIME,
-            FORMAT_REGEX = /^-?\d+:\d+:\d+$/,
-            SECOND = 1000,
-            MINUTE = SECOND * 60,
-            HOUR = MINUTE * 60;
-
-        function SinewaveDeltaFormat() {
-        }
-
-        function twoDigit(v) {
-            return v >= 10 ? String(v) : ('0' + v);
-        }
-
-        SinewaveDeltaFormat.prototype.format = function (value) {
-            var delta = Math.abs(value - START_TIME),
-                negative = value < START_TIME,
-                seconds = Math.floor(delta / SECOND) % 60,
-                minutes = Math.floor(delta / MINUTE) % 60,
-                hours = Math.floor(delta / HOUR);
-            return (negative ? "-" : "") +
-                [ hours, minutes, seconds ].map(twoDigit).join(":");
-        };
-
-        SinewaveDeltaFormat.prototype.validate = function (text) {
-            return FORMAT_REGEX.test(text);
-        };
-
-        SinewaveDeltaFormat.prototype.parse = function (text) {
-            var negative = text[0] === "-",
-                parts = text.replace("-", "").split(":");
-            return [ HOUR, MINUTE, SECOND ].map(function (sz, i) {
-                return parseInt(parts[i], 10) * sz;
-            }).reduce(function (a, b) {
-                return a + b;
-            }, 0) * (negative ? -1 : 1) + START_TIME;
-        };
-
-        return SinewaveDeltaFormat;
-    }
-);

example/generator/src/SinewaveLimitCapability.js

@@ -30,25 +30,25 @@ define(
             YELLOW = 0.5,
             LIMITS = {
                 rh: {
-                    cssClass: "s-limit-upr s-limit-red",
+                    cssClass: "s-limit-upr-red",
                     low: RED,
                     high: Number.POSITIVE_INFINITY,
                     name: "Red High"
                 },
                 rl: {
-                    cssClass: "s-limit-lwr s-limit-red",
+                    cssClass: "s-limit-lwr-red",
                     high: -RED,
                     low: Number.NEGATIVE_INFINITY,
                     name: "Red Low"
                 },
                 yh: {
-                    cssClass: "s-limit-upr s-limit-yellow",
+                    cssClass: "s-limit-upr-yellow",
                     low: YELLOW,
                     high: RED,
                     name: "Yellow High"
                 },
                 yl: {
-                    cssClass: "s-limit-lwr s-limit-yellow",
+                    cssClass: "s-limit-lwr-yellow",
                     low: -RED,
                     high: -YELLOW,
                     name: "Yellow Low"

example/generator/src/SinewaveTelemetrySeries.js

@@ -25,12 +25,12 @@
  * Module defining SinewaveTelemetry. Created by vwoeltje on 11/12/14.
  */
 define(
-    ['./SinewaveConstants'],
-    function (SinewaveConstants) {
+    [],
+    function () {
         "use strict";
 
         var ONE_DAY = 60 * 60 * 24,
-            firstObservedTime = Math.floor(SinewaveConstants.START_TIME / 1000);
+            firstObservedTime = Math.floor(Date.now() / 1000) - ONE_DAY;
 
         /**
          *
@@ -58,11 +58,8 @@ define(
             };
 
             generatorData.getDomainValue = function (i, domain) {
-                // delta uses the same numeric values as the default domain,
-                // so it's not checked for here, just formatted for display
-                // differently.
                 return (i + offset) * 1000 + firstTime * 1000 -
-                    (domain === 'yesterday' ? (ONE_DAY * 1000) : 0);
+                    (domain === 'yesterday' ? ONE_DAY : 0);
             };
 
             generatorData.getRangeValue = function (i, range) {

example/mobile/bundle.json

@@ -1,12 +0,0 @@
-{
-  "name": "Mobile",
-  "description": "Allows elements with pertinence to mobile usage and development",
-  "extensions": {
-    "stylesheets": [
-      {
-        "stylesheetUrl": "css/mobile-example.css",
-        "priority": "mandatory"
-      }
-    ]
-  }
-}

example/mobile/res/config.rb

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

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

@@ -1,103 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/************************** FEATURES */
-/************************** VERY INFLUENTIAL GLOBAL DIMENSIONS */
-/************************** RATIOS */
-/************************** LAYOUT */
-/************************** CONTROLS */
-/************************** PATHS */
-/************************** TIMINGS */
-/************************** LIMITS */
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/************************** MOBILE REPRESENTATION ITEMS DIMENSIONS */
-/************************** MOBILE TREE MENU DIMENSIONS */
-/************************** WINDOW DIMENSIONS FOR RWD */
-/************************** MEDIA QUERIES: WINDOW CHECKS FOR SPECIFIC ORIENTATIONS FOR EACH DEVICE */
-/************************** MEDIA QUERIES: WINDOWS FOR SPECIFIC ORIENTATIONS FOR EACH DEVICE */
-/************************** DEVICE PARAMETERS FOR MENUS/REPRESENTATIONS */
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/* REQUIRES mobile/_constants */
-@media screen and (orientation: portrait) and (max-width: 514px) and (max-height: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (max-height: 514px) and (max-width: 740px) and (max-device-width: 1024px) and (max-device-height: 799px), screen and (orientation: portrait) and (min-width: 515px) and (max-width: 799px) and (min-height: 741px) and (max-height: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 799px) and (max-device-height: 1024px), screen and (orientation: landscape) and (min-height: 515px) and (max-height: 799px) and (min-width: 741px) and (max-width: 1024px) and (max-device-width: 1024px) and (max-device-height: 799px) {
-  /* line 28, ../sass/mobile-example.scss */
-  .create-btn-holder {
-    display: block !important; } }

example/mobile/res/sass/mobile-example.scss

@@ -1,31 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-@import "../../../../platform/commonUI/general/res/sass/constants";
-@import "../../../../platform/commonUI/general/res/sass/mobile/constants";
-@import "../../../../platform/commonUI/general/res/sass/mobile/mixins";
-
-@include phoneandtablet {
-    // Show the Create button
-    .create-btn-holder {
-        display: block !important;
-    }
-}

example/notifications/bundle.json

@@ -1,47 +0,0 @@
-{
-    "extensions": {
-        "templates": [
-            {
-                "key": "dialogLaunchTemplate",
-                "templateUrl": "dialog-launch.html"
-            },
-            {
-                "key": "notificationLaunchTemplate",
-                "templateUrl": "notification-launch.html"
-            }
-        ],
-        "controllers": [
-            {
-                "key": "DialogLaunchController",
-                "implementation": "DialogLaunchController.js",
-                "depends": [
-                    "$scope",
-                    "$timeout",
-                    "$log",
-                    "dialogService",
-                    "notificationService"
-                ]
-            },
-            {
-                "key": "NotificationLaunchController",
-                "implementation": "NotificationLaunchController.js",
-                "depends": [
-                    "$scope",
-                    "$timeout",
-                    "$log",
-                    "notificationService"
-                ]
-            }
-        ],
-        "indicators": [
-            {
-                "implementation": "DialogLaunchIndicator.js",
-                "priority": "fallback"
-            },
-            {
-                "implementation": "NotificationLaunchIndicator.js",
-                "priority": "fallback"
-            }
-        ]
-    }
-}

example/notifications/res/dialog-launch.html

@@ -1,10 +0,0 @@
-<span class="status block ok" ng-controller="DialogLaunchController">
-    <span class="ui-symbol status-indicator">&#xe600;</span>
-    <span class="label">
-        <a ng-click="launchProgress(true)">Known</a> |
-        <a ng-click="launchProgress(false)">Unknown</a> |
-        <a ng-click="launchError()">Error</a> |
-        <a ng-click="launchInfo()">Info</a>
-    </span>
-    <span class="count">Dialogs</span>
-</span>

example/notifications/res/notification-launch.html

@@ -1,10 +0,0 @@
-<span class="status block ok" ng-controller="NotificationLaunchController">
-    <span class="ui-symbol status-indicator">&#xe600;</span>
-    <span class="label">
-        <a ng-click="newInfo()">Success</a> |
-        <a ng-click="newError()">Error</a> |
-        <a ng-click="newAlert()">Alert</a> |
-        <a ng-click="newProgress()">Progress</a>
-    </span>
-    <span class="count">Notifications</span>
-</span>

example/notifications/src/DialogLaunchController.js

@@ -1,150 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-
-define(
-    [],
-    function () {
-        "use strict";
-
-        /**
-         * A controller for the dialog launch view. This view allows manual
-         * launching of dialogs for demonstration and testing purposes. It
-         * also demonstrates the use of the DialogService.
-         * @param $scope
-         * @param $timeout
-         * @param $log
-         * @param dialogService
-         * @param notificationService
-         * @constructor
-         */
-        function DialogLaunchController($scope, $timeout, $log, dialogService, notificationService) {
-
-            /*
-            Demonstrates launching a progress dialog and updating it
-             periodically with the progress of an ongoing process.
-             */
-            $scope.launchProgress = function (knownProgress) {
-                var model = {
-                    title: "Progress Dialog Example",
-                    progress: 0,
-                    hint: "Do not navigate away from this page or close this browser tab while this operation is in progress.",
-                    actionText: "Calculating...",
-                    unknownProgress: !knownProgress,
-                    unknownDuration: false,
-                    severity: "info",
-                    options: [
-                        {
-                            label: "Cancel Operation",
-                            callback: function () {
-                                $log.debug("Operation cancelled");
-                                dialogService.dismiss();
-                            }
-                        },
-                        {
-                            label: "Do something else...",
-                            callback: function () {
-                                $log.debug("Something else pressed");
-                            }
-                        }
-                    ]
-                };
-
-                function incrementProgress() {
-                    model.progress = Math.min(100, Math.floor(model.progress + Math.random() * 30));
-                    model.progressText = ["Estimated time remaining: about ", 60 - Math.floor((model.progress / 100) * 60), " seconds"].join(" ");
-                    if (model.progress < 100) {
-                        $timeout(incrementProgress, 1000);
-                    }
-                }
-
-                if (dialogService.showBlockingMessage(model)) {
-                    //Do processing here
-                    model.actionText = "Processing 100 objects...";
-                    if (knownProgress) {
-                        $timeout(incrementProgress, 1000);
-                    }
-                } else {
-                    $log.error("Could not display modal dialog");
-                }
-            };
-
-
-            /*
-             Demonstrates launching an error dialog
-             */
-            $scope.launchError = function () {
-                var model = {
-                    title: "Error Dialog Example",
-                    actionText: "Something happened, and it was not good.",
-                    severity: "error",
-                    options: [
-                        {
-                            label: "Try Again",
-                            callback: function () {
-                                $log.debug("Try Again Pressed");
-                                dialogService.dismiss();
-                            }
-                        },
-                        {
-                            label: "Cancel",
-                            callback: function () {
-                                $log.debug("Cancel Pressed");
-                                dialogService.dismiss();
-                            }
-                        }
-                    ]
-                };
-
-                if (!dialogService.showBlockingMessage(model)) {
-                    $log.error("Could not display modal dialog");
-                }
-            };
-
-            /*
-             Demonstrates launching an error dialog
-             */
-            $scope.launchInfo = function () {
-                var model = {
-                    title: "Info Dialog Example",
-                    actionText: "This is an example of a blocking info" +
-                    " dialog. This dialog can be used to draw the user's" +
-                    " attention to an event.",
-                    severity: "info",
-                    primaryOption: {
-                            label: "OK",
-                            callback: function () {
-                                $log.debug("OK Pressed");
-                                dialogService.dismiss();
-                            }
-                        }
-                };
-
-                if (!dialogService.showBlockingMessage(model)) {
-                    $log.error("Could not display modal dialog");
-                }
-            };
-
-        }
-        return DialogLaunchController;
-    }
-);

example/notifications/src/DialogLaunchIndicator.js

@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define,window*/
-
-define(
-    [],
-    function () {
-        "use strict";
-
-        /**
-         * A tool for manually invoking dialogs. When included this
-         * indicator will allow for dialogs of different types to be
-         * launched for demonstration and testing purposes.
-         * @constructor
-         */
-        function DialogLaunchIndicator() {
-
-        }
-
-        DialogLaunchIndicator.template = 'dialogLaunchTemplate';
-
-        DialogLaunchIndicator.prototype.getGlyph = function () {
-            return "i";
-        };
-        DialogLaunchIndicator.prototype.getGlyphClass = function () {
-            return 'caution';
-        };
-        DialogLaunchIndicator.prototype.getText = function () {
-            return "Launch test dialog";
-        };
-        DialogLaunchIndicator.prototype.getDescription = function () {
-            return "Launch test dialog";
-        };
-
-        return DialogLaunchIndicator;
-    }
-);

example/notifications/src/NotificationLaunchController.js

@@ -1,172 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-
-define(
-    [],
-    function () {
-        "use strict";
-
-        /**
-         * Allows launching of notification messages for the purposes of
-         * demonstration and testing. Also demonstrates use of
-         * the NotificationService. Notifications are non-blocking messages that
-         * appear at the bottom of the screen to inform the user of events
-         * in a non-intrusive way. For more information see the
-         * {@link NotificationService}
-         * @param $scope
-         * @param $timeout
-         * @param $log
-         * @param notificationService
-         * @constructor
-         */
-        function NotificationLaunchController($scope, $timeout, $log, notificationService) {
-            var messageCounter = 1;
-
-            function getExampleActionText() {
-                var actionTexts = [
-                    "Adipiscing turpis mauris in enim elementu hac, enim aliquam etiam.",
-                    "Eros turpis, pulvinar turpis eros eu",
-                    "Lundium nascetur a, lectus montes ac, parturient in natoque, duis risus risus pulvinar pid rhoncus, habitasse auctor natoque!"
-                ];
-                return actionTexts[Math.floor(Math.random()*3)];
-            }
-
-            function getExampleActions() {
-                var actions = [
-                    {
-                        label: "Try Again",
-                        callback: function () {
-                            $log.debug("Try Again pressed");
-                        }
-                    },
-                    {
-                        label: "Remove",
-                        callback: function () {
-                            $log.debug("Remove pressed");
-                        }
-                    },
-                    {
-                        label: "Cancel",
-                        callback: function () {
-                            $log.debug("Cancel pressed");
-                        }
-                    }
-                ];
-
-                // Randomly remove some actions off the top; leave at least one
-                actions.splice(0,Math.floor(Math.random() * actions.length));
-
-                return actions;
-            }
-
-            function getExampleSeverity() {
-                var severities = [
-                    "info",
-                    "alert",
-                    "error"
-                ];
-                return severities[Math.floor(Math.random() * severities.length)];
-            }
-
-            /**
-             * Launch a new notification with a severity level of 'Error'.
-             */
-            $scope.newError = function(){
-
-                notificationService.notify({
-                    title: "Example error notification " + messageCounter++,
-                    hint: "An error has occurred",
-                    severity: "error",
-                    primaryOption: {
-                        label: 'Retry',
-                        callback: function() {
-                            $log.info('Retry clicked');
-                        }
-                    },
-                    options: getExampleActions()});
-            };
-            /**
-             * Launch a new notification with a severity of 'Alert'.
-             */
-            $scope.newAlert = function(){
-
-                notificationService.notify({
-                    title: "Alert notification " + (messageCounter++),
-                    hint: "This is an alert message",
-                    severity: "alert",
-                    primaryOption: {
-                        label: 'Retry',
-                        callback: function() {
-                            $log.info('Retry clicked');
-                        }
-                    },
-                    options: getExampleActions()});
-            };
-
-
-            /**
-             * Launch a new notification with a progress bar that is updated
-             * periodically, tracking an ongoing process.
-             */
-            $scope.newProgress = function(){
-
-                var notificationModel = {
-                    title: "Progress notification example",
-                    severity: "info",
-                    progress: 0,
-                    actionText: getExampleActionText(),
-                    unknownProgress: false
-                };
-
-                /**
-                 * Simulate an ongoing process and update the progress bar.
-                 * @param notification
-                 */
-                function incrementProgress(notificationModel) {
-                    notificationModel.progress = Math.min(100, Math.floor(notificationModel.progress + Math.random() * 30));
-                    notificationModel.progressText = ["Estimated time" +
-                    " remaining:" +
-                    " about ", 60 - Math.floor((notificationModel.progress / 100) * 60), " seconds"].join(" ");
-                    if (notificationModel.progress < 100) {
-                        $timeout(function(){incrementProgress(notificationModel);}, 1000);
-                    }
-                }
-
-                notificationService.notify(notificationModel);
-                incrementProgress(notificationModel);
-            };
-
-            /**
-             * Launch a new notification with severity level of INFO.
-             */
-            $scope.newInfo = function(){
-
-                notificationService.info({
-                    title: "Example Info notification " + messageCounter++
-                });
-            };
-
-        }
-        return NotificationLaunchController;
-    }
-);

example/notifications/src/NotificationLaunchIndicator.js

@@ -1,50 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define,window*/
-
-define(
-    [],
-    function () {
-        "use strict";
-
-        function NotificationLaunchIndicator() {
-
-        }
-
-        NotificationLaunchIndicator.template = 'notificationLaunchTemplate';
-
-        NotificationLaunchIndicator.prototype.getGlyph = function () {
-            return "i";
-        };
-        NotificationLaunchIndicator.prototype.getGlyphClass = function () {
-            return 'caution';
-        };
-        NotificationLaunchIndicator.prototype.getText = function () {
-            return "Launch notification";
-        };
-        NotificationLaunchIndicator.prototype.getDescription = function () {
-            return "Launch notification";
-        };
-
-        return NotificationLaunchIndicator;
-    }
-);

example/profiling/src/DigestIndicator.js

@@ -39,11 +39,8 @@ define(
                 start = Date.now();
 
             function update() {
-                var now = Date.now(),
-                    secs = (now - start) / 1000;
+                var secs = (Date.now() - start) / 1000;
                 displayed = Math.round(digests / secs);
-                start = now;
-                digests = 0;
             }
 
             function increment() {

example/scratchpad/README.md

@@ -1,2 +0,0 @@
-Example of using multiple persistence stores by exposing a root
-object with a different space prefix.

example/scratchpad/bundle.json

@@ -1,23 +0,0 @@
-{
-    "extensions": {
-        "roots": [
-            {
-                "id": "scratch:root",
-                "model": {
-                    "type": "folder",
-                    "composition": [],
-                    "name": "Scratchpad"
-                },
-                "priority": "preferred"
-            }
-        ],
-        "components": [
-            {
-                "provides": "persistenceService",
-                "type": "provider",
-                "implementation": "ScratchPersistenceProvider.js",
-                "depends": [ "$q" ]
-            }
-        ]
-    }
-}

example/scratchpad/src/ScratchPersistenceProvider.js

@@ -1,79 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-
-/*global define,window*/
-
-define(
-    [],
-    function () {
-        'use strict';
-
-        /**
-         * The ScratchPersistenceProvider keeps JSON documents in memory
-         * and provides a persistence interface, but changes are lost on reload.
-         * @memberof example/scratchpad
-         * @constructor
-         * @implements {PersistenceService}
-         * @param q Angular's $q, for promises
-         */
-        function ScratchPersistenceProvider($q) {
-            this.$q = $q;
-            this.table = {};
-        }
-
-        ScratchPersistenceProvider.prototype.listSpaces = function () {
-            return this.$q.when(['scratch']);
-        };
-
-        ScratchPersistenceProvider.prototype.listObjects = function (space) {
-            return this.$q.when(
-                space === 'scratch' ? Object.keys(this.table) : []
-            );
-        };
-
-        ScratchPersistenceProvider.prototype.createObject = function (space, key, value) {
-            if (space === 'scratch') {
-                this.table[key] = JSON.stringify(value);
-            }
-            return this.$q.when(space === 'scratch');
-        };
-
-        ScratchPersistenceProvider.prototype.readObject = function (space, key) {
-            return this.$q.when(
-                (space === 'scratch' && this.table[key]) ?
-                        JSON.parse(this.table[key]) : undefined
-            );
-        };
-
-        ScratchPersistenceProvider.prototype.deleteObject = function (space, key, value) {
-            if (space === 'scratch') {
-                delete this.table[key];
-            }
-            return this.$q.when(space === 'scratch');
-        };
-
-        ScratchPersistenceProvider.prototype.updateObject =
-            ScratchPersistenceProvider.prototype.createObject;
-
-        return ScratchPersistenceProvider;
-    }
-);

karma.conf.js

@@ -34,6 +34,7 @@ module.exports = function(config) {
         // List of files / patterns to load in the browser.
         // By default, files are also included in a script tag.
         files: [
+            '**/moment*',
             {pattern: 'example/**/*.js', included: false},
             {pattern: 'platform/**/*.js', included: false},
             {pattern: 'warp/**/*.js', included: false},

package.json

@@ -22,8 +22,7 @@
     "split": "^1.0.0",
     "mkdirp": "^0.5.1",
     "nomnoml": "^0.0.3",
-    "canvas": "^1.2.7",
-    "markdown-toc": "^0.11.7"
+    "canvas": "^1.2.7"
   },
   "scripts": {
     "start": "node app.js",
@@ -31,7 +30,7 @@
     "jshint": "jshint platform example || exit 0",
     "watch": "karma start",
     "jsdoc": "jsdoc -c jsdoc.json -r -d target/docs/api",
-    "otherdoc": "node docs/gendocs.js --in docs/src --out target/docs --suppress-toc 'docs/src/index.md|docs/src/process/index.md'",
+    "otherdoc": "node docs/gendocs.js --in docs/src --out target/docs",
     "docs": "npm run jsdoc ; npm run otherdoc"
   },
   "repository": {

platform/commonUI/browse/bundle.json

@@ -20,21 +20,23 @@
                     "$scope",
                     "$route",
                     "$location",
+                    "$q",
                     "objectService",
                     "navigationService",
                     "urlService"
                 ]
             },
             {
-                "key": "PaneController",
-                "implementation": "PaneController.js",
+                "key": "BrowseTreeController",
+                "implementation": "BrowseTreeController.js",
                 "priority": "preferred",
-                "depends": [ "$scope", "agentService","$window" ]
+                "depends": [ "$scope", "agentService" ]
             },
             {
                 "key": "BrowseObjectController",
                 "implementation": "BrowseObjectController.js",
-                "depends": [ "$scope", "$location", "$route" ]
+                "depends": [ "$scope", "$location", "$route", "$q",
+                    "navigationService" ]
             },
             {
                 "key": "CreateMenuController",
@@ -62,6 +64,7 @@
             {
                 "key": "browse-object",
                 "templateUrl": "templates/browse-object.html",
+                "gestures": ["drop"],
                 "uses": [ "view" ]
             },
             {
@@ -102,12 +105,6 @@
                 "implementation": "navigation/NavigationService.js"
             }
         ],
-        "policies": [
-            {
-                "implementation": "creation/CreationPolicy.js",
-                "category": "creation"
-            }
-        ],
         "actions": [
             {
                 "key": "navigate",
@@ -160,7 +157,7 @@
                 "provides": "creationService",
                 "type": "provider",
                 "implementation": "creation/CreationService.js",
-                "depends": [ "$q", "$log" ]
+                "depends": [ "persistenceService", "now", "$q", "$log" ]
             }
         ],
         "runs": [
@@ -179,6 +176,16 @@
                 "copyright": "Copyright (c) Sindre Sorhus <sindresorhus@gmail.com> (sindresorhus.com)",
                 "license": "license-mit",
                 "link": "https://github.com/sindresorhus/screenfull.js/blob/gh-pages/license"
+            },
+            {
+                "name": "Math.uuid.js",
+                "version": "1.4",
+                "description": "Unique identifer generation (code adapted.)",
+                "author": "Robert Kieffer",
+                "website": "https://github.com/broofa/node-uuid",
+                "copyright": "Copyright (c) 2010 Robert Kieffer",
+                "license": "license-mit",
+                "link": "http://opensource.org/licenses/MIT"
             }
         ]
     }

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

@@ -19,18 +19,24 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<span ng-controller="BrowseObjectController">
-    <div class="object-browse-bar l-flex-row">
-        <div class="items-select left flex-elem l-flex-row grows">
+<div ng-init="
+    editBtns = [{ cssclass: 'save',title: 'Save' },{ cssclass: 'cancel',title: 'Discard Changes', action:'cancelEditing' }];
+"></div>
+<span ng-controller="BrowseObjectController"
+      mct-before-unload="getUnloadWarning()">
+    <a class="s-btn"
+       style="opacity: 0.9; position:absolute; right: 250px; z-index: 100"
+       ng-class="{ major:!editMode }"
+       ng-click="editMode = !editMode">Set EditMode to {{!editMode}}</a>
+    <div class="object-browse-bar bar l-flex">
+        <div class="items-select left">
             <mct-representation key="'back-arrow'"
                                 mct-object="domainObject"
-                                class="flex-elem l-back"></mct-representation>
-            <mct-representation key="'object-header'"
-                                mct-object="domainObject"
-                                class="l-flex-row flex-elem grows object-header">
+                                class="l-back"></mct-representation>
+            <mct-representation key="'object-header'" mct-object="domainObject">
             </mct-representation>
         </div>
-        <div class="btn-bar right l-flex-row flex-elem flex-justify-end flex-fixed">
+        <div class="btn-bar right">
             <mct-representation key="'switcher'"
                                 mct-object="domainObject"
                                 ng-model="representation">
@@ -43,8 +49,70 @@
             </mct-representation>
         </div>
     </div>
-    <mct-representation key="representation.selected.key"
-                        mct-object="representation.selected.key && domainObject"
-                        class="abs object-holder">
-    </mct-representation>
+
+    <div class="l-object-wrapper"
+         ng-class="{ active:editMode, 'edit-main':editMode}">
+        <div class="l-object-wrapper-inner l-flex flex-col">
+            <!-- Toolbar and Save/Cancel buttons -->
+            <div class="l-edit-controls flex-elem l-flex flex-row flex-align-end"
+                 ng-class="{ active:editMode }">
+
+
+
+
+<!--                <mct-toolbar name="mctToolbar"
+                             structure="toolbar.structure"
+                             ng-model="toolbar.state"
+                             class="flex-elem grow">
+                </mct-toolbar>-->
+                <!-- from toolbar.html -->
+                <mct-toolbar-x class="flex-elem grow ellipsis">
+                    <form novalidate>
+                        <div class="tool-bar btn-bar">
+                            <span class="l-control-group">
+                                <span class="s-menu-btn">Foo</span>
+                                <span class="s-menu-btn">Bar</span>
+                            </span>
+                            <span class="l-control-group">
+                                <span class="s-menu-btn">Foo</span>
+                                <span class="s-menu-btn">Bar</span>
+                                <span class="s-menu-btn">Foo</span>
+                                <span class="s-menu-btn">Lorem</span>
+                            </span>
+                            <span class="l-control-group">
+                                <span class="s-menu-btn">Foo</span>
+                                <span class="s-menu-btn">Bar</span>
+                                <span class="s-menu-btn">Lorem</span>
+                            </span>
+                            <span class="s-menu-btn">Lorem</span>
+                        </div>
+                    </form>
+                </mct-toolbar-x>
+
+
+
+
+<!--                <mct-representation key="'edit-action-buttons'"
+                                    mct-object="domainObject"
+                                    class='flex-elem conclude-editing'>
+                </mct-representation>-->
+                <!-- from edit-action-buttons.html -->
+                <span class='flex-elem conclude-editing'>
+                    <span ng-repeat="btn in editBtns">
+                        <a class='s-btn t-{{btn.cssclass}}'
+                           title='{{btn.title}}'
+                           ng-click="doAction(btn.action)"
+                           ng-class="{ major: $index === 0 }">
+                            <span class="title-label">{{btn.title}}</span>
+                        </a>
+                    </span>
+                </span>
+
+            </div>
+            <mct-representation key="representation.selected.key"
+                                mct-object="representation.selected.key && domainObject"
+                                class="flex-elem grow object-holder">
+            </mct-representation>
+        </div>
+    </div>
 </span>

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

@@ -22,66 +22,45 @@
 
 <div class="abs holder-all browse-mode" ng-controller="BrowseController">
     <mct-include key="'topbar-browse'"></mct-include>
-    <div class="abs holder holder-main browse-area s-browse-area browse-wrapper"
-         ng-controller="PaneController as modelPaneTree"
-         ng-class="modelPaneTree.visible() ? 'pane-tree-showing' : 'pane-tree-hidden'">
-        <mct-split-pane class='abs contents'
-                        anchor='left'>
+    <div class="holder browse-area s-browse-area abs browse-wrapper"
+         ng-controller="BrowseTreeController as tree"
+         ng-class="tree.visible() ? 'browse-showtree' : 'browse-hidetree'">
+        <mct-split-pane class='contents abs' anchor='left'>
             <div class='split-pane-component treeview pane left'>
-                <div class="abs holder l-flex-col holder-treeview-elements">
+                <div class="holder abs l-mobile">
                     <mct-representation key="'create-button'"
                                         mct-object="navigatedObject"
-                                        class="holder flex-elem create-btn-holder">
-                    </mct-representation>
-                    <mct-include key="'search'"
-                                 ng-model="treeModel"
-                                 class="holder l-flex-col flex-elem search-holder"
-                                 ng-class="{ active: treeModel.search, grows: treeModel.search }">
-                    </mct-include>
-                    <mct-representation key="'tree'"
-                                        mct-object="domainObject"
-                                        parameters="tree"
-                                        ng-model="treeModel"
-                                        class="holder flex-elem grows vscroll tree-holder"
-                                        ng-hide="treeModel.search">
+                                        mct-device="desktop">
                     </mct-representation>
+                    <div class='holder search-holder abs'
+                         ng-class="{active: treeModel.search}">
+                        <mct-representation key="'search'"
+                                     mct-object="domainObject"
+                                     ng-model="treeModel">
+                        </mct-representation>
+                    </div>
+                    <div class='tree-holder abs mobile-tree-holder'
+                         ng-hide="treeModel.search">
+                        <mct-representation key="'tree'"
+                                            mct-object="domainObject"
+                                            parameters="tree"
+                                            ng-model="treeModel">
+                        </mct-representation>
+                    </div>
                 </div>
             </div>
 
-            <mct-splitter class="splitter-treeview mobile-hide"></mct-splitter>
+            <mct-splitter class="mobile-hide"></mct-splitter>
 
-            <div class='split-pane-component items pane primary-pane right'>
-                <a class="mini-tab-icon anchor-left toggle-pane toggle-tree"
-                   title="{{ modelPaneTree.visible()? 'Hide' : 'Show' }} this pane"
-                   ng-click="modelPaneTree.toggle()"
-                   ng-class="{ collapsed : !modelPaneTree.visible() }"></a>
-
-                <div class='holder holder-object-and-inspector abs' id='content-area'
-                     ng-controller="PaneController as modelPaneInspect"
-                     ng-class="modelPaneInspect.visible() ? 'pane-inspect-showing' : 'pane-inspect-hidden'">
-
-                    <mct-split-pane class='l-object-and-inspector contents abs' anchor='right'>
-                        <div class='split-pane-component t-object pane primary-pane left'>
-                            <mct-representation mct-object="navigatedObject"
-                                                key="'browse-object'"
-                                                class="abs holder holder-object">
-                            </mct-representation>
-                        </div>
-
-                        <mct-splitter class="splitter-inspect mobile-hide flush-right edge-shdw"></mct-splitter>
-
-                        <div class="split-pane-component t-inspect pane right mobile-hide">
-                            <mct-representation key="'object-inspector'"
-                                                mct-object="domainObject"
-                                                ng-model="treeModel">
-                            </mct-representation>
-                            <a class="mini-tab-icon anchor-right mobile-hide toggle-pane toggle-inspect"
-                               title="{{ modelPaneInspect.visible()? 'Hide' : 'Show' }} the Inspection pane"
-                               ng-click="modelPaneInspect.toggle()"
-                               ng-class="{ collapsed : !modelPaneInspect.visible() }"></a>
-                        </div>
-                    </mct-split-pane>
+            <div class='split-pane-component items pane right-repr'>
+                <div class='holder abs l-mobile' id='content-area'>
+                    <mct-representation mct-object="navigatedObject"
+                                        key="'browse-object'">
+                    </mct-representation>
                 </div>
+                <div class="key-properties ui-symbol icon mobile-menu-icon desktop-hide"
+                     mct-device="mobile"
+                     ng-click="tree.toggle()">m</div>
             </div>
         </mct-split-pane>
     </div>

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

@@ -19,12 +19,12 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<span class='type-icon ui-symbol flex-elem'>{{type.getGlyph()}}</span>
-<span class="l-elem-wrapper l-flex-row flex-elem grows">
-    <span ng-if="parameters.mode" class='action flex-elem'>{{parameters.mode}}</span>
-    <span class='title-label flex-elem flex-can-shrink'>{{model.name}}</span>
-    <mct-representation
-        key="'menu-arrow'"
-        mct-object='domainObject'
-        class="flex-elem"></mct-representation>
-</span>
+<div class='object-header object-header-mobile'>
+    <span class='type-icon ui-symbol'>{{type.getGlyph()}}</span>
+    <!--span class='type-name mobile-important-hide'>{{type.getName()}}</span-->
+    <span class="l-elem-wrapper l-flex">
+        <span ng-if="parameters.mode" class='action'>{{parameters.mode}}</span>
+        <span class='title-label'>{{model.name}}</span>
+        <mct-representation key="'menu-arrow'" mct-object='domainObject'></mct-representation>
+    </span>
+</div>

platform/commonUI/browse/res/templates/create/create-button.html

@@ -19,12 +19,13 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<span ng-controller="ClickAwayController as createController">
+<div class="menu-element wrapper" ng-controller="ClickAwayController as createController">
     <div class="s-menu-btn major create-btn" ng-click="createController.toggle()">
+		<span class="ui-symbol icon type-icon">&#x2b;</span>
 		<span class="title-label">Create</span>
     </div>
     <div class="menu super-menu" ng-show="createController.isActive()">
         <mct-representation mct-object="domainObject" key="'create-menu'">
         </mct-representation>
     </div>
-</span>
+</div>

platform/commonUI/browse/res/templates/items/grid-item.html

@@ -26,8 +26,14 @@
             <div class='ui-symbol profile' title='Shared'>&#x4f;</div>
             <mct-representation class="desktop-hide" key="'info-button'" mct-object="domainObject"></mct-representation>
         </div>
-        <div class='item-main abs lg'>
-            <span class="t-item-icon" ng-class="{ 'l-icon-link':location.isLink() }">{{type.getGlyph()}}</span>
+        <div class='item-main abs'>
+            <div class='ui-symbol icon lg item-type'>
+                {{type.getGlyph()}}
+                <span
+                    class="ui-symbol l-icon-link" title="This object is a link"
+                    ng-show="location.isLink()"
+                    ></span>
+            </div>
             <div class='ui-symbol abs item-open'>}</div>
         </div>
         <div class='bottom-bar bar abs'>

platform/commonUI/browse/src/BrowseController.js

@@ -26,8 +26,11 @@
  * @namespace platform/commonUI/browse
  */
 define(
-    [],
-    function () {
+    [
+        '../../../representation/src/gestures/GestureConstants',
+        '../../edit/src/objects/EditableDomainObject'
+    ],
+    function (GestureConstants, EditableDomainObject) {
         "use strict";
 
         var ROOT_ID = "ROOT",
@@ -43,7 +46,7 @@ define(
          * @memberof platform/commonUI/browse
          * @constructor
          */
-        function BrowseController($scope, $route, $location, objectService, navigationService, urlService) {
+        function BrowseController($scope, $route, $location, $q, objectService, navigationService, urlService) {
             var path = [ROOT_ID].concat(
                 ($route.current.params.ids || DEFAULT_PATH).split("/")
             );
@@ -71,13 +74,17 @@ define(
             // Callback for updating the in-scope reference to the object
             // that is currently navigated-to.
             function setNavigation(domainObject) {
-                $scope.navigatedObject = domainObject;
+
+                var wrappedObject = domainObject;
+
+                $scope.navigatedObject = wrappedObject;
                 $scope.treeModel.selectedObject = domainObject;
                 navigationService.setNavigation(domainObject);
                 updateRoute(domainObject);
             }
 
             function navigateTo(domainObject) {
+
                 // Check if an object has been navigated-to already...
                 // If not, or if an ID path has been explicitly set in the URL,
                 // navigate to the URL-specified object.
@@ -148,11 +155,12 @@ define(
 
             // Also listen for changes which come from the tree
             $scope.$watch("treeModel.selectedObject", setNavigation);
-
+            
             // Clean up when the scope is destroyed
             $scope.$on("$destroy", function () {
                 navigationService.removeListener(setNavigation);
             });
+            
         }
 
         return BrowseController;

platform/commonUI/browse/src/BrowseObjectController.js

@@ -22,8 +22,9 @@
 /*global define,Promise*/
 
 define(
-    [],
-    function () {
+    ['../../../representation/src/gestures/GestureConstants', 
+        '../../edit/src/objects/EditableDomainObject'],
+    function (GestureConstants, EditableDomainObject) {
         "use strict";
 
         /**
@@ -32,8 +33,10 @@ define(
          * @memberof platform/commonUI/browse
          * @constructor
          */
-        function BrowseObjectController($scope, $location, $route) {
+        function BrowseObjectController($scope, $location, $route, $q, navigationService) {
+            var navigatedObject;
             function setViewForDomainObject(domainObject) {
+                
                 var locationViewKey = $location.search().view;
 
                 function selectViewIfMatching(view) {
@@ -47,6 +50,8 @@ define(
                     ((domainObject && domainObject.useCapability('view')) || [])
                         .forEach(selectViewIfMatching);
                 }
+                $scope.editMode = domainObject.getDomainObject ? true : false;
+                navigatedObject = domainObject;
             }
 
             function updateQueryParam(viewKey) {
@@ -67,6 +72,15 @@ define(
 
             $scope.$watch('domainObject', setViewForDomainObject);
             $scope.$watch('representation.selected.key', updateQueryParam);
+
+            $scope.cancelEditing = function() {
+                navigationService.setNavigation($scope.domainObject.getDomainObject());
+            }
+
+            $scope.doAction = function (action){
+                $scope[action] && $scope[action]();
+            }
+
         }
 
         return BrowseObjectController;

platform/commonUI/browse/src/BrowseTreeController.js

@@ -33,12 +33,10 @@ define(
          * @constructor
          * @memberof platform/commonUI/browse
          */
-        function PaneController($scope, agentService, $window) {
+        function BrowseTreeController($scope, agentService) {
             var self = this;
             this.agentService = agentService;
-
-            // Fast and cheap: if this has been opened in a new window, hide panes by default
-            this.state = !$window.opener;
+            this.state = true;
 
             /**
              * Callback to invoke when any selection occurs in the tree.
@@ -46,7 +44,7 @@ define(
              * to the tree representation.
              *
              * @property {Function} callback
-             * @memberof platform/commonUI/browse.PaneController#
+             * @memberof platform/commonUI/browse.BrowseTreeController#
              */
             this.callback = function () {
                 // Note that, since this is a callback to pass, this is not
@@ -61,20 +59,20 @@ define(
         }
 
         /**
-         * Toggle the visibility of the pane.
+         * Toggle the visibility of the tree.
          */
-        PaneController.prototype.toggle = function () {
+        BrowseTreeController.prototype.toggle = function () {
             this.state = !this.state;
         };
 
         /**
-         * Get the desired visibility state of the pane.
+         * Get the desired visibility state of the tree.
          * @returns {boolean} true when visible
          */
-        PaneController.prototype.visible = function () {
+        BrowseTreeController.prototype.visible = function () {
             return this.state;
         };
 
-        return PaneController;
+        return BrowseTreeController;
     }
 );

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

@@ -69,7 +69,7 @@ define(
 
             // Introduce one create action per type
             return this.typeService.listTypes().filter(function (type) {
-                return self.policyService.allow("creation", type);
+                return type.hasFeature("creation");
             }).map(function (type) {
                 return new CreateAction(
                     type,

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

@@ -1,45 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-
-define(
-    [],
-    function () {
-        "use strict";
-
-        /**
-         * A policy for determining whether objects of a given type can be
-         * created.
-         * @constructor
-         * @implements {Policy}
-         * @memberof platform/commonUI/browse
-         */
-        function CreationPolicy() {
-        }
-
-        CreationPolicy.prototype.allow = function (type) {
-            return type.hasFeature("creation");
-        };
-
-        return CreationPolicy;
-    }
-);

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

@@ -25,8 +25,8 @@
  * Module defining CreateService. Created by vwoeltje on 11/10/14.
  */
 define(
-    [],
-    function () {
+    ["../../lib/uuid"],
+    function (uuid) {
         "use strict";
 
         var NON_PERSISTENT_WARNING =
@@ -42,9 +42,11 @@ define(
          * @memberof platform/commonUI/browse
          * @constructor
          */
-        function CreationService($q, $log) {
+        function CreationService(persistenceService, now, $q, $log) {
+            this.persistenceService = persistenceService;
             this.$q = $q;
             this.$log = $log;
+            this.now = now;
         }
 
         /**
@@ -68,17 +70,26 @@ define(
          */
         CreationService.prototype.createObject = function (model, parent) {
             var persistence = parent.getCapability("persistence"),
-                newObject = parent.useCapability("instantiation", model),
-                newObjectPersistence = newObject.getCapability("persistence"),
                 self = this;
 
+            // Persist the new domain object's model; it will be fully
+            // constituted as a domain object when loaded back, as all
+            // domain object models are.
+            function doPersist(space, id, model) {
+                return self.persistenceService.createObject(
+                    space,
+                    id,
+                    model
+                ).then(function () { return id; });
+            }
+
             // Add the newly-created object's id to the parent's
             // composition, so that it will subsequently appear
             // as a child contained by that parent.
-            function addToComposition() {
+            function addToComposition(id, parent, parentPersistence) {
                 var compositionCapability = parent.getCapability('composition'),
                     addResult = compositionCapability &&
-                        compositionCapability.add(newObject);
+                        compositionCapability.add(id);
 
                 return self.$q.when(addResult).then(function (result) {
                     if (!result) {
@@ -86,7 +97,7 @@ define(
                         return undefined;
                     }
 
-                    return persistence.persist().then(function () {
+                    return parentPersistence.persist().then(function () {
                         return result;
                     });
                 });
@@ -94,13 +105,21 @@ define(
 
             // We need the parent's persistence capability to determine
             // what space to create the new object's model in.
-            if (!persistence || !newObjectPersistence) {
+            if (!persistence) {
                 self.$log.warn(NON_PERSISTENT_WARNING);
                 return self.$q.reject(new Error(NON_PERSISTENT_WARNING));
             }
 
-            // Persist the new object, then add it to composition.
-            return newObjectPersistence.persist().then(addToComposition);
+            // We create a new domain object in three sequential steps:
+            // 1. Get a new UUID for the object
+            // 2. Create a model with that ID in the persistence space
+            // 3. Add that ID to
+            return self.$q.when(uuid()).then(function (id) {
+                model.persisted = self.now();
+                return doPersist(persistence.getSpace(), id, model);
+            }).then(function (id) {
+                return addToComposition(id, parent, persistence);
+            });
         };
 
 

platform/commonUI/browse/test/BrowseTreeControllerSpec.js

@@ -22,24 +22,22 @@
 /*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/
 
 define(
-    ["../src/PaneController"],
-    function (PaneController) {
+    ["../src/BrowseTreeController"],
+    function (BrowseTreeController) {
         'use strict';
 
-        describe("The PaneController", function () {
+        describe("The BrowseTreeController", function () {
             var mockScope,
                 mockAgentService,
                 mockDomainObjects,
-                mockWindow,
                 controller;
 
             // We want to reinstantiate for each test case
             // because device state can influence constructor-time behavior
             function instantiateController() {
-                return new PaneController(
+                return new BrowseTreeController(
                     mockScope,
-                    mockAgentService,
-                    mockWindow
+                    mockAgentService
                 );
             }
 
@@ -60,7 +58,6 @@ define(
                     "agentService",
                     [ "isMobile", "isPhone", "isTablet", "isPortrait", "isLandscape" ]
                 );
-                mockWindow = jasmine.createSpyObj("$window", ["open"]);
             });
 
             it("is initially visible", function () {

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

@@ -33,9 +33,6 @@ define(
             var mockTypeService,
                 mockDialogService,
                 mockCreationService,
-                mockPolicyService,
-                mockCreationPolicy,
-                mockPolicyMap = {},
                 mockTypes,
                 provider;
 
@@ -70,32 +67,14 @@ define(
                     "creationService",
                     [ "createObject" ]
                 );
-                mockPolicyService = jasmine.createSpyObj(
-                    "policyService",
-                    [ "allow" ]
-                );
-
                 mockTypes = [ "A", "B", "C" ].map(createMockType);
 
-                mockTypes.forEach(function(type){
-                    mockPolicyMap[type.getName()] = true;
-                });
-
-                mockCreationPolicy = function(type){
-                    return mockPolicyMap[type.getName()];
-                };
-
-                mockPolicyService.allow.andCallFake(function(category, type){
-                    return category === "creation" && mockCreationPolicy(type) ? true : false;
-                });
-
                 mockTypeService.listTypes.andReturn(mockTypes);
 
                 provider = new CreateActionProvider(
                     mockTypeService,
                     mockDialogService,
-                    mockCreationService,
-                    mockPolicyService
+                    mockCreationService
                 );
             });
 
@@ -115,15 +94,15 @@ define(
 
             it("does not expose non-creatable types", function () {
                 // One of the types won't have the creation feature...
-                mockPolicyMap[mockTypes[0].getName()] = false;
+                mockTypes[1].hasFeature.andReturn(false);
                 // ...so it should have been filtered out.
                 expect(provider.getActions({
                     key: "create",
                     domainObject: {}
                 }).length).toEqual(2);
                 // Make sure it was creation which was used to check
-                expect(mockPolicyService.allow)
-                    .toHaveBeenCalledWith("creation", mockTypes[0]);
+                expect(mockTypes[1].hasFeature)
+                    .toHaveBeenCalledWith("creation");
             });
         });
     }

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

@@ -1,53 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define,describe,it,expect,beforeEach,jasmine*/
-
-define(
-    ["../../src/creation/CreationPolicy"],
-    function (CreationPolicy) {
-        "use strict";
-
-        describe("The creation policy", function () {
-            var mockType,
-                policy;
-
-            beforeEach(function () {
-                mockType = jasmine.createSpyObj(
-                    'type',
-                    ['hasFeature']
-                );
-
-                policy = new CreationPolicy();
-            });
-
-            it("allows creation of types with the creation feature", function () {
-                mockType.hasFeature.andReturn(true);
-                expect(policy.allow(mockType)).toBeTruthy();
-            });
-
-            it("disallows creation of types without the creation feature", function () {
-                mockType.hasFeature.andReturn(false);
-                expect(policy.allow(mockType)).toBeFalsy();
-            });
-        });
-    }
-);

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

@@ -30,7 +30,9 @@ define(
         "use strict";
 
         describe("The creation service", function () {
-            var mockQ,
+            var mockPersistenceService,
+                mockNow,
+                mockQ,
                 mockLog,
                 mockParentObject,
                 mockNewObject,
@@ -38,9 +40,7 @@ define(
                 mockPersistenceCapability,
                 mockCompositionCapability,
                 mockContextCapability,
-                mockCreationCapability,
                 mockCapabilities,
-                mockNewPersistenceCapability,
                 creationService;
 
             function mockPromise(value) {
@@ -60,6 +60,11 @@ define(
             }
 
             beforeEach(function () {
+                mockPersistenceService = jasmine.createSpyObj(
+                    "persistenceService",
+                    [ "createObject" ]
+                );
+                mockNow = jasmine.createSpy('now');
                 mockQ = { when: mockPromise, reject: mockReject };
                 mockLog = jasmine.createSpyObj(
                     "$log",
@@ -71,7 +76,7 @@ define(
                 );
                 mockNewObject = jasmine.createSpyObj(
                     "newObject",
-                    [ "getId", "getCapability", "useCapability" ]
+                    [ "getId" ]
                 );
                 mockMutationCapability = jasmine.createSpyObj(
                     "mutation",
@@ -89,22 +94,19 @@ define(
                     "context",
                     ["getPath"]
                 );
-                mockCreationCapability = jasmine.createSpyObj(
-                    "creation",
-                    ["instantiate", "invoke"]
-                );
                 mockCapabilities = {
                     mutation: mockMutationCapability,
                     persistence: mockPersistenceCapability,
                     composition: mockCompositionCapability,
-                    context: mockContextCapability,
-                    instantiation: mockCreationCapability
+                    context: mockContextCapability
                 };
-                mockNewPersistenceCapability = jasmine.createSpyObj(
-                    "new-persistence",
-                    [ "persist", "getSpace" ]
+
+                mockPersistenceService.createObject.andReturn(
+                    mockPromise(true)
                 );
 
+                mockNow.andReturn(12321);
+
                 mockParentObject.getCapability.andCallFake(function (key) {
                     return mockCapabilities[key];
                 });
@@ -113,16 +115,9 @@ define(
                 });
                 mockParentObject.getId.andReturn('parentId');
 
-                mockNewObject.getId.andReturn('newId');
-                mockNewObject.getCapability.andCallFake(function (c) {
-                    return c === 'persistence' ?
-                            mockNewPersistenceCapability : undefined;
-                });
-
-                mockPersistenceCapability.persist
-                    .andReturn(mockPromise(true));
-                mockNewPersistenceCapability.persist
-                    .andReturn(mockPromise(true));
+                mockPersistenceCapability.persist.andReturn(
+                    mockPromise(true)
+                );
 
                 mockMutationCapability.invoke.andReturn(mockPromise(true));
                 mockPersistenceCapability.getSpace.andReturn("testSpace");
@@ -130,12 +125,10 @@ define(
                     mockPromise([mockNewObject])
                 );
                 mockCompositionCapability.add.andReturn(mockPromise(true));
-                mockCreationCapability.instantiate.andReturn(mockNewObject);
-                mockCreationCapability.invoke.andCallFake(function (model) {
-                    return mockCreationCapability.instantiate(model);
-                });
 
                 creationService = new CreationService(
+                    mockPersistenceService,
+                    mockNow,
                     mockQ,
                     mockLog
                 );
@@ -144,18 +137,21 @@ define(
             it("allows new objects to be created", function () {
                 var model = { someKey: "some value" };
                 creationService.createObject(model, mockParentObject);
-                expect(mockCreationCapability.instantiate)
-                    .toHaveBeenCalledWith(model);
+                expect(mockPersistenceService.createObject).toHaveBeenCalledWith(
+                    "testSpace",
+                    jasmine.any(String), // the object id; generated UUID
+                    model
+                );
             });
 
-            it("adds new objects to the parent's composition", function () {
+            it("adds new id's to the parent's composition", function () {
                 var model = { someKey: "some value" },
                     parentModel = { composition: ["notAnyUUID"] };
                 creationService.createObject(model, mockParentObject);
 
                 // Verify that a new ID was added
                 expect(mockCompositionCapability.add)
-                    .toHaveBeenCalledWith(mockNewObject);
+                    .toHaveBeenCalledWith(jasmine.any(String));
             });
 
             it("provides the newly-created object", function () {
@@ -211,6 +207,11 @@ define(
                 expect(mockLog.error).toHaveBeenCalled();
             });
 
+            it("attaches a 'persisted' timestamp", function () {
+                var model = { someKey: "some value" };
+                creationService.createObject(model, mockParentObject);
+                expect(model.persisted).toEqual(mockNow());
+            });
 
         });
     }

platform/commonUI/browse/test/suite.json

@@ -1,14 +1,13 @@
 [
     "BrowseController",
     "BrowseObjectController",
-    "PaneController",
+    "BrowseTreeController",
     "MenuArrowController",
     "creation/CreateAction",
     "creation/CreateActionProvider",
     "creation/CreateMenuController",
     "creation/CreateWizard",
     "creation/CreationService",
-    "creation/CreationPolicy",
     "creation/LocatorController",
     "navigation/NavigateAction",
     "navigation/NavigationService",

platform/commonUI/dialog/bundle.json

@@ -24,18 +24,6 @@
             {
                 "key": "form-dialog",
                 "templateUrl": "templates/dialog.html"
-            },
-            {
-                "key": "overlay-blocking-message",
-                "templateUrl": "templates/overlay-blocking-message.html"
-            },
-            {
-                "key": "message",
-                "templateUrl": "templates/message.html"
-            },
-            {
-                "key": "overlay-message-list",
-                "templateUrl": "templates/overlay-message-list.html"
             }
         ],
         "containers": [

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

@@ -21,13 +21,17 @@
 -->
 <div class="abs top-bar">
     <div class="title">{{ngModel.title}}</div>
-    <div class="hint">All fields marked <span class="ui-symbol req">*</span> are required.</div>
+    <div class="hint">
+        All fields marked <span class="ui-symbol req">*</span> are required.
+    </div>
 </div>
-<div class='abs editor'>
-    <mct-form ng-model="ngModel.value"
-              structure="ngModel.structure"
-              name="createForm">
-    </mct-form>
+<div class="abs form editor">
+    <div class='abs contents l-dialog'>
+        <mct-form ng-model="ngModel.value"
+                  structure="ngModel.structure"
+                  name="createForm">
+        </mct-form>
+    </div>
 </div>
 <div class="abs bottom-bar">
     <a class='s-btn major'

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

@@ -1,32 +0,0 @@
-<div class="l-message"
-     ng-class="'message-severity-' + ngModel.severity">
-    <div class="ui-symbol type-icon message-type"></div>
-    <div class="message-contents">
-        <div class="top-bar">
-            <div class="title">{{ngModel.title}}</div>
-            <div class="hint" ng-hide="ngModel.hint === undefined">{{ngModel.hint}}</div>
-        </div>
-        <div class="message-body">
-            <div class="message-action">
-                {{ngModel.actionText}}
-            </div>
-            <mct-include key="'progress-bar'"
-                         ng-model="ngModel"
-                         ng-show="ngModel.progress !== undefined || ngModel.unknownProgress"></mct-include>
-        </div>
-        <div class="bottom-bar">
-            <a ng-repeat="dialogOption in ngModel.options"
-               class="s-btn major"
-               ng-click="dialogOption.callback()">
-                {{dialogOption.label}}
-            </a>
-            <a class="s-btn major"
-               ng-if="ngModel.primaryOption"
-               ng-click="ngModel.primaryOption.callback()">
-                {{ngModel.primaryOption.label}}
-            </a>
-
-        </div>
-
-    </div>
-</div>

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

@@ -1,19 +0,0 @@
-<mct-container key="overlay" class="t-message-list">
-    <div class="message-contents">
-        <div class="abs top-bar">
-            <div class="title">{{ngModel.dialog.title}}</div>
-            <div class="hint">Displaying {{ngModel.dialog.messages.length}} message<span ng-show="ngModel.dialog.messages.length > 1">s</span>
-            </div>
-        </div>
-        <div class="abs message-body">
-            <mct-include ng-repeat="msg in ngModel.dialog.messages | orderBy: '-'" key="'message'" ng-model="msg"></mct-include>
-        </div>
-        <div class="abs bottom-bar">
-            <a ng-repeat="dialogAction in ngModel.dialog.actions"
-               class="s-btn major"
-               ng-click="dialogAction.action()">
-                {{dialogAction.label}}
-            </a>
-        </div>
-    </div>
-</mct-container>

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

@@ -24,11 +24,13 @@
         <div class="title">{{ngModel.dialog.title}}</div>
         <div class="hint">{{ngModel.dialog.hint}}</div>
     </div>
-    <div class='abs editor'>
-        <mct-include key="ngModel.dialog.template"
-                     parameters="ngModel.dialog.parameters"
-                     ng-model="ngModel.dialog.model">
-        </mct-include>
+    <div class="abs form outline editor">
+        <div class='abs contents l-dialog'>
+            <mct-include key="ngModel.dialog.template"
+                         parameters="ngModel.dialog.parameters"
+                         ng-model="ngModel.dialog.model">
+            </mct-include>
+        </div>
     </div>
     <div class="abs bottom-bar">
         <a ng-repeat="option in ngModel.dialog.options"

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

@@ -22,9 +22,14 @@
 <div class="abs overlay">
     <div class="abs blocker"></div>
     <div class="abs holder">
-        <a ng-click="ngModel.cancel()"
+        <a href=""
+           ng-click="ngModel.cancel()"
            ng-if="ngModel.cancel"
-           class="clk-icon icon ui-symbol close">x</a>
-        <div class="abs contents" ng-transclude></div>
+           class="clk-icon icon ui-symbol close">
+            x
+        </a>
+        <div class="abs contents" ng-transclude>
+
+        </div>
     </div>
 </div>

platform/commonUI/dialog/src/DialogService.js

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

platform/commonUI/dialog/src/OverlayService.js

@@ -28,7 +28,7 @@ define(
 
         // Template to inject into the DOM to show the dialog; really just points to
         // the a specific template that can be included via mct-include
-        var TEMPLATE = '<mct-include ng-model="overlay" key="key" ng-class="typeClass"></mct-include>';
+        var TEMPLATE = '<mct-include ng-model="overlay" key="key"></mct-include>';
 
 
         /**
@@ -71,11 +71,8 @@ define(
          * @param {object} overlayModel the model to pass to the
          *        included overlay template (this will be passed
          *        in via ng-model)
-         * @param {string} typeClass the element class to use in rendering
-         *        the overlay. Can be specified to provide custom styling of
-         *        overlays
          */
-        OverlayService.prototype.createOverlay = function (key, overlayModel, typeClass) {
+        OverlayService.prototype.createOverlay = function (key, overlayModel) {
             // Create a new scope for this overlay
             var scope = this.newScope(),
                 element;
@@ -93,7 +90,6 @@ define(
             // Populate the scope; will be passed directly to the template
             scope.overlay = overlayModel;
             scope.key = key;
-            scope.typeClass = typeClass || 't-dialog';
 
             // Create the overlay element and add it to the document's body
             element = this.$compile(TEMPLATE)(scope);

platform/commonUI/dialog/test/DialogServiceSpec.js

@@ -116,22 +116,10 @@ define(
                         dialog: dialogModel,
                         confirm: jasmine.any(Function),
                         cancel: jasmine.any(Function)
-                    },
-                    't-dialog'
-                );
-            });
-
-            it("invokes the overlay service with the correct parameters when" +
-                " a blocking dialog is requested", function() {
-                var dialogModel = {};
-                expect(dialogService.showBlockingMessage(dialogModel)).toBe(true);
-                expect(mockOverlayService.createOverlay).toHaveBeenCalledWith(
-                    "overlay-blocking-message",
-                    dialogModel,
-                    "t-dialog-sm"
+                    }
                 );
             });
 
         });
     }
-);
+);

platform/commonUI/edit/res/templates/edit-action-buttons.html

@@ -21,10 +21,11 @@
 -->
 <span ng-controller="EditActionController">
     <span ng-repeat="currentAction in editActions">
-        <a class='s-btn'
+        <a class='s-btn t-{{currentAction.getMetadata().key}}'
+           title='{{currentAction.getMetadata().name}}'
            ng-click="currentAction.perform()"
-           ng-class="{ major: $index === 0, subtle: $index !== 0 }">
-            {{currentAction.getMetadata().name}}
+           ng-class="{ major: $index === 0 }">
+            <span class="title-label">{{currentAction.getMetadata().name}}</span>
         </a>
     </span>
 </span>

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

@@ -24,9 +24,7 @@
     <ul class="tree">
         <li ng-repeat="containedObject in composition">
             <span class="tree-item">
-                <mct-representation key="'label'"
-                                    mct-object="containedObject"
-                                    class="rep-object-label">
+                <mct-representation key="'label'" mct-object="containedObject">
                 </mct-representation>
             </span>
         </li>

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

@@ -22,8 +22,7 @@
 <div class='top-bar edit abs'>
     <mct-representation key="'object-header'"
                         mct-object="domainObject"
-                        parameters="{ mode: 'Edit' }"
-                        class="l-flex-row flex-elem grows object-header">
+                        parameters="{ mode: 'Edit' }">
     </mct-representation>
     <div class='buttons-main btn-bar buttons abs'>
         <mct-representation key="'switcher'"

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

@@ -25,8 +25,8 @@
  * Module defining EditAction. Created by vwoeltje on 11/14/14.
  */
 define(
-    [],
-    function () {
+    ['../objects/EditableDomainObject'],
+    function (EditableDomainObject) {
         "use strict";
 
         // A no-op action to return in the event that the action cannot
@@ -71,8 +71,10 @@ define(
          * Enter edit mode.
          */
         EditAction.prototype.perform = function () {
-            this.navigationService.setNavigation(this.domainObject);
-            this.$location.path("/edit");
+            if (!this.domainObject.getDomainObject) {
+                this.navigationService.setNavigation(new EditableDomainObject(this.domainObject));
+            }
+            //this.$location.path("/edit");
         };
 
         /**
@@ -83,10 +85,11 @@ define(
          */
         EditAction.appliesTo = function (context) {
             var domainObject = (context || {}).domainObject,
-                type = domainObject && domainObject.getCapability('type');
+                type = domainObject && domainObject.getCapability('type'),
+                isEditMode = domainObject && domainObject.getDomainObject ? true : false;
 
             // Only allow creatable types to be edited
-            return type && type.hasFeature('creation');
+            return type && type.hasFeature('creation') && !isEditMode;
         };
 
         return EditAction;

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

@@ -50,7 +50,7 @@ define(
             // Simply trigger refresh of in-view objects; do not
             // write anything to database.
             persistence.persist = function () {
-                return cache.markDirty(editableObject);
+                cache.markDirty(editableObject);
             };
 
             // Delegate refresh to the original object; this avoids refreshing

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

@@ -101,6 +101,10 @@ define(
                             new Factory(capability, editableObject, domainObject, cache) :
                             capability;
                 };
+                
+                editableObject.getDomainObject = function() {
+                    return domainObject;
+                }
 
                 return editableObject;
             }

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

@@ -111,7 +111,6 @@ define(
          */
         EditableDomainObjectCache.prototype.markDirty = function (domainObject) {
             this.dirtyObjects[domainObject.getId()] = domainObject;
-            return this.$q.when(true);
         };
 
         /**

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

@@ -31,7 +31,6 @@ define(
                 mockEditableObject,
                 mockDomainObject,
                 mockCache,
-                mockPromise,
                 capability;
 
             beforeEach(function () {
@@ -51,9 +50,7 @@ define(
                     "cache",
                     [ "markDirty" ]
                 );
-                mockPromise = jasmine.createSpyObj("promise", ["then"]);
 
-                mockCache.markDirty.andReturn(mockPromise);
                 mockDomainObject.getCapability.andReturn(mockPersistence);
 
                 capability = new EditablePersistenceCapability(
@@ -87,10 +84,6 @@ define(
                 expect(mockPersistence.refresh).toHaveBeenCalled();
             });
 
-            it("returns a promise from persist", function () {
-                expect(capability.persist().then).toEqual(jasmine.any(Function));
-            });
-
         });
     }
 );

platform/commonUI/formats/bundle.json

@@ -1,26 +0,0 @@
-{
-    "name": "Time services bundle",
-    "description": "Defines interfaces and provides default implementations for handling different time systems.",
-    "extensions": {
-        "components": [
-            {
-                "provides": "formatService",
-                "type": "provider",
-                "implementation": "FormatProvider.js",
-                "depends": [ "formats[]" ]
-            }
-        ],
-        "formats": [
-            {
-                "key": "utc",
-                "implementation": "UTCTimeFormat.js"
-            }
-        ],
-        "constants": [
-            {
-                "key": "DEFAULT_TIME_FORMAT",
-                "value": "utc"
-            }
-        ]
-    }
-}

platform/commonUI/formats/src/FormatProvider.js

@@ -1,114 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-
-define([
-
-], function (
-
-) {
-    "use strict";
-
-    /**
-     * An object used to convert between numeric values and text values,
-     * typically used to display these values to the user and to convert
-     * user input to a numeric format, particularly for time formats.
-     * @interface {Format}
-     */
-
-    /**
-     * Parse text (typically user input) to a numeric value.
-     * Behavior is undefined when the text cannot be parsed;
-     * `validate` should be called first if the text may be invalid.
-     * @method parse
-     * @memberof Format#
-     * @param {string} text the text to parse
-     * @returns {number} the parsed numeric value
-     */
-
-    /**
-     * Determine whether or not some text (typically user input) can
-     * be parsed to a numeric value by this format.
-     * @method validate
-     * @memberof Format#
-     * @param {string} text the text to parse
-     * @returns {boolean} true if the text can be parsed
-     */
-
-    /**
-     * Convert a numeric value to a text value for display using
-     * this format.
-     * @method format
-     * @memberof Format#
-     * @param {number} value the numeric value to format
-     * @returns {string} the text representation of the value
-     */
-
-    /**
-     * Provides access to `Format` objects which can be used to
-     * convert values between human-readable text and numeric
-     * representations.
-     * @interface FormatService
-     */
-
-    /**
-     * Look up a format by its symbolic identifier.
-     * @method getFormat
-     * @memberof FormatService#
-     * @param {string} key the identifier for this format
-     * @returns {Format} the format
-     * @throws {Error} errors when the requested format is unrecognized
-     */
-
-    /**
-     * Provides formats from the `formats` extension category.
-     * @constructor
-     * @implements {FormatService}
-     * @memberof platform/commonUI/formats
-     * @param {Array.<function(new : Format)>} format constructors,
-     *        from the `formats` extension category.
-     */
-    function FormatProvider(formats) {
-        var formatMap = {};
-
-        function addToMap(Format) {
-            var key = Format.key;
-            if (key && !formatMap[key]) {
-                formatMap[key] = new Format();
-            }
-        }
-
-        formats.forEach(addToMap);
-        this.formatMap = formatMap;
-    }
-
-    FormatProvider.prototype.getFormat = function (key) {
-        var format = this.formatMap[key];
-        if (!format) {
-            throw new Error("FormatProvider: No format found for " + key);
-        }
-        return format;
-    };
-
-    return FormatProvider;
-
-});

platform/commonUI/formats/src/UTCTimeFormat.js

@@ -1,63 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define*/
-
-define([
-    'moment'
-], function (
-    moment
-) {
-    "use strict";
-
-    var DATE_FORMAT = "YYYY-MM-DD HH:mm:ss",
-        DATE_FORMATS = [
-            DATE_FORMAT,
-            "YYYY-MM-DD HH:mm",
-            "YYYY-MM-DD"
-        ];
-
-
-    /**
-     * Formatter for UTC timestamps. Interprets numeric values as
-     * milliseconds since the start of 1970.
-     *
-     * @implements {Format}
-     * @constructor
-     * @memberof platform/commonUI/formats
-     */
-    function UTCTimeFormat() {
-    }
-
-    UTCTimeFormat.prototype.format = function (value) {
-        return moment.utc(value).format(DATE_FORMAT);
-    };
-
-    UTCTimeFormat.prototype.parse = function (text) {
-        return moment.utc(text, DATE_FORMATS).valueOf();
-    };
-
-    UTCTimeFormat.prototype.validate = function (text) {
-        return moment.utc(text, DATE_FORMATS).isValid();
-    };
-
-    return UTCTimeFormat;
-});

platform/commonUI/formats/test/FormatProviderSpec.js

@@ -1,68 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/
-
-define(
-    ['../src/FormatProvider'],
-    function (FormatProvider) {
-        'use strict';
-
-        var KEYS = [ 'a', 'b', 'c' ];
-
-        describe("The FormatProvider", function () {
-            var mockFormats,
-                mockLog,
-                mockFormatInstances,
-                provider;
-
-            beforeEach(function () {
-                mockFormatInstances = KEYS.map(function (k) {
-                    return jasmine.createSpyObj(
-                        'format-' + k,
-                        [ 'parse', 'validate', 'format' ]
-                    );
-                });
-                // Return constructors
-                mockFormats = KEYS.map(function (k, i) {
-                    function MockFormat() { return mockFormatInstances[i]; }
-                    MockFormat.key = k;
-                    return MockFormat;
-                });
-                provider = new FormatProvider(mockFormats);
-            });
-
-            it("looks up formats by key", function () {
-                KEYS.forEach(function (k, i) {
-                    expect(provider.getFormat(k))
-                        .toEqual(mockFormatInstances[i]);
-                });
-            });
-
-            it("throws an error about unknown formats", function () {
-                expect(function () {
-                    provider.getFormat('some-unknown-format');
-                }).toThrow();
-            });
-
-        });
-    }
-);

platform/commonUI/formats/test/UTCTimeFormatSpec.js

@@ -1,56 +0,0 @@
-/*****************************************************************************
- * Open MCT Web, Copyright (c) 2014-2015, United States Government
- * as represented by the Administrator of the National Aeronautics and Space
- * Administration. All rights reserved.
- *
- * Open MCT Web is licensed under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- * http://www.apache.org/licenses/LICENSE-2.0.
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
- * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
- * License for the specific language governing permissions and limitations
- * under the License.
- *
- * Open MCT Web includes source code licensed under additional open source
- * licenses. See the Open Source Licenses file (LICENSES.md) included with
- * this source code distribution or the Licensing information page available
- * at runtime from the About dialog for additional information.
- *****************************************************************************/
-/*global define,Promise,describe,it,expect,beforeEach,waitsFor,jasmine*/
-
-define(
-    ['../src/UTCTimeFormat', 'moment'],
-    function (UTCTimeFormat, moment) {
-        'use strict';
-
-        describe("The UTCTimeFormat", function () {
-            var format;
-
-            beforeEach(function () {
-                format = new UTCTimeFormat();
-            });
-
-            it("formats UTC timestamps", function () {
-                var timestamp = 12345670000,
-                    formatted = format.format(timestamp);
-                expect(formatted).toEqual(jasmine.any(String));
-                expect(moment.utc(formatted).valueOf()).toEqual(timestamp);
-            });
-
-            it("validates time inputs", function () {
-                expect(format.validate("1977-05-25 11:21:22")).toBe(true);
-                expect(format.validate("garbage text")).toBe(false);
-            });
-
-            it("parses valid input", function () {
-                var text = "1977-05-25 11:21:22",
-                    parsed = format.parse(text);
-                expect(parsed).toEqual(jasmine.any(Number));
-                expect(parsed).toEqual(moment.utc(text).valueOf());
-            });
-        });
-    }
-);

platform/commonUI/formats/test/suite.json

@@ -1,4 +0,0 @@
-[
-    "FormatProvider",
-    "UTCTimeFormat"
-]

platform/commonUI/general/bundle.json

@@ -18,11 +18,7 @@
         "runs": [
             {
                 "implementation": "StyleSheetLoader.js",
-                "depends": [ "stylesheets[]", "$document", "THEME" ]
-            },
-            {
-                "implementation": "UnsupportedBrowserWarning.js",
-                "depends": [ "notificationService", "agentService" ]
+                "depends": [ "stylesheets[]", "$document" ]
             }
         ],
         "stylesheets": [
@@ -48,14 +44,6 @@
                 "key": "indicator",
                 "templateUrl": "templates/indicator.html"
             },
-            {
-                "key": "message-banner",
-                "templateUrl": "templates/message-banner.html"
-            },
-            {
-                "key": "progress-bar",
-                "templateUrl": "templates/progress-bar.html"
-            },
             {
               "key": "time-controller",
               "templateUrl": "templates/controls/time-controller.html"
@@ -65,18 +53,13 @@
             {
                 "key": "TimeRangeController",
                 "implementation": "controllers/TimeRangeController.js",
-                "depends": [ "$scope", "formatService", "DEFAULT_TIME_FORMAT", "now" ]
+                "depends": [ "$scope", "now" ]
             },
             {
                 "key": "DateTimePickerController",
                 "implementation": "controllers/DateTimePickerController.js",
                 "depends": [ "$scope", "now" ]
             },
-            {
-                "key": "DateTimeFieldController",
-                "implementation": "controllers/DateTimeFieldController.js",
-                "depends": [ "$scope", "formatService", "DEFAULT_TIME_FORMAT" ]
-            },
             {
                 "key": "TreeNodeController",
                 "implementation": "controllers/TreeNodeController.js",
@@ -124,16 +107,6 @@
                 "key": "SelectorController",
                 "implementation": "controllers/SelectorController.js",
                 "depends": [ "objectService", "$scope" ]
-            },
-            {
-                "key": "ObjectInspectorController",
-                "implementation": "controllers/ObjectInspectorController.js",
-                "depends": [ "$scope", "objectService" ]
-            },
-            {
-                "key": "BannerController",
-                "implementation": "controllers/BannerController.js",
-                "depends": ["$scope", "notificationService", "dialogService"]
             }
         ],
         "directives": [
@@ -198,11 +171,6 @@
             {
                 "key": "MCT_SCROLL_Y_ATTRIBUTE",
                 "value": "mctScrollY"
-            },
-            {
-                "key": "THEME",
-                "value": "unspecified",
-                "priority": "fallback"
             }
         ],
         "containers": [
@@ -229,6 +197,10 @@
                 "templateUrl": "templates/subtree.html",
                 "uses": [ "composition" ]
             },
+            {
+                "key": "test",
+                "templateUrl": "templates/test.html"
+            },
             {
                 "key": "tree-node",
                 "templateUrl": "templates/tree-node.html",
@@ -260,10 +232,6 @@
                 "key": "switcher",
                 "templateUrl": "templates/controls/switcher.html",
                 "uses": [ "view" ]
-            },
-            {
-                "key": "object-inspector",
-                "templateUrl": "templates/object-inspector.html"
             }
         ],
         "controls": [
@@ -274,10 +242,6 @@
             {
                 "key": "datetime-picker",
                 "templateUrl": "templates/controls/datetime-picker.html"
-            },
-            {
-                "key": "datetime-field",
-                "templateUrl": "templates/controls/datetime-field.html"
             }
         ],
         "licenses": [

platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json

@@ -1,51 +1,19 @@
 {
 	"metadata": {
-		"name": "WTD Symbols",
-		"lastOpened": 1446670352108,
-		"created": 1446670349721
+		"name": "WTD-Symbols-v25",
+		"lastOpened": 1445369623428,
+		"created": 1445367449289
 	},
 	"iconSets": [
 		{
 			"selection": [
-				{
-					"order": 116,
-					"id": 93,
-					"prevSize": 32,
-					"code": 58902,
-					"name": "icon-eye-open-no-gleam",
-					"tempChar": ""
-				},
-				{
-					"order": 115,
-					"id": 92,
-					"prevSize": 32,
-					"code": 58901,
-					"name": "icon-eye-open",
-					"tempChar": ""
-				},
-				{
-					"order": 110,
-					"id": 91,
-					"prevSize": 32,
-					"code": 58899,
-					"name": "icon-collapse-pane-left",
-					"tempChar": ""
-				},
-				{
-					"order": 111,
-					"id": 90,
-					"prevSize": 32,
-					"code": 58900,
-					"name": "icon-collapse-pane-right",
-					"tempChar": ""
-				},
 				{
 					"order": 109,
 					"id": 89,
 					"prevSize": 32,
 					"code": 58898,
 					"name": "icon-save",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 108,
@@ -53,7 +21,7 @@
 					"prevSize": 32,
 					"code": 58897,
 					"name": "icon-dataset",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 90,
@@ -61,7 +29,7 @@
 					"prevSize": 32,
 					"code": 58896,
 					"name": "icon-bell",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 91,
@@ -69,7 +37,7 @@
 					"prevSize": 32,
 					"code": 58889,
 					"name": "icon-hourglass",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 92,
@@ -82,7 +50,7 @@
 						58890
 					],
 					"name": "icon-info-v15",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 93,
@@ -90,7 +58,7 @@
 					"prevSize": 32,
 					"code": 58887,
 					"name": "icon-x-in-circle",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 94,
@@ -98,7 +66,7 @@
 					"prevSize": 32,
 					"code": 58881,
 					"name": "icon-datatable",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 95,
@@ -106,7 +74,7 @@
 					"prevSize": 32,
 					"code": 58882,
 					"name": "icon-tabular-scrolling",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 96,
@@ -114,7 +82,7 @@
 					"prevSize": 32,
 					"code": 58884,
 					"name": "icon-tabular",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 97,
@@ -122,7 +90,7 @@
 					"prevSize": 32,
 					"code": 58885,
 					"name": "icon-calendar",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 98,
@@ -130,7 +98,7 @@
 					"prevSize": 32,
 					"code": 58886,
 					"name": "icon-paint-bucket",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 99,
@@ -138,7 +106,7 @@
 					"prevSize": 32,
 					"code": 123,
 					"name": "icon-pointer-left",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 100,
@@ -146,7 +114,7 @@
 					"prevSize": 32,
 					"code": 125,
 					"name": "icon-pointer-right",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 101,
@@ -154,7 +122,7 @@
 					"prevSize": 32,
 					"code": 80,
 					"name": "icon-person",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 102,
@@ -162,7 +130,7 @@
 					"prevSize": 32,
 					"code": 232,
 					"name": "icon-chain-links",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 103,
@@ -170,7 +138,7 @@
 					"prevSize": 32,
 					"code": 115,
 					"name": "icon-database-in-brackets",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 104,
@@ -178,7 +146,7 @@
 					"prevSize": 32,
 					"code": 114,
 					"name": "icon-refresh",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 105,
@@ -186,7 +154,7 @@
 					"prevSize": 32,
 					"code": 108,
 					"name": "icon-lock",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 106,
@@ -194,7 +162,7 @@
 					"prevSize": 32,
 					"code": 51,
 					"name": "icon-box-with-dashed-lines",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 10,
@@ -202,7 +170,7 @@
 					"prevSize": 32,
 					"code": 58880,
 					"name": "icon-box-with-arrow-cursor",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 11,
@@ -210,7 +178,7 @@
 					"prevSize": 32,
 					"code": 65,
 					"name": "icon-activity-mode",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 12,
@@ -218,7 +186,7 @@
 					"prevSize": 32,
 					"code": 97,
 					"name": "icon-activity",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 87,
@@ -226,7 +194,7 @@
 					"prevSize": 32,
 					"code": 33,
 					"name": "icon-alert-rect",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 14,
@@ -234,7 +202,7 @@
 					"prevSize": 32,
 					"code": 58883,
 					"name": "icon-alert-triangle",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 15,
@@ -242,7 +210,7 @@
 					"prevSize": 32,
 					"code": 238,
 					"name": "icon-arrow-double-down",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 16,
@@ -250,7 +218,7 @@
 					"prevSize": 32,
 					"code": 235,
 					"name": "icon-arrow-double-up",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 2,
@@ -258,7 +226,7 @@
 					"prevSize": 32,
 					"code": 118,
 					"name": "icon-arrow-down",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 19,
@@ -266,7 +234,7 @@
 					"prevSize": 32,
 					"code": 60,
 					"name": "icon-arrow-left",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 20,
@@ -274,7 +242,7 @@
 					"prevSize": 32,
 					"code": 62,
 					"name": "icon-arrow-right",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 21,
@@ -282,7 +250,7 @@
 					"prevSize": 32,
 					"code": 236,
 					"name": "icon-arrow-tall-down",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 22,
@@ -290,7 +258,7 @@
 					"prevSize": 32,
 					"code": 237,
 					"name": "icon-arrow-tall-up",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 23,
@@ -298,7 +266,7 @@
 					"prevSize": 32,
 					"code": 94,
 					"name": "icon-arrow-up",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 24,
@@ -306,7 +274,7 @@
 					"prevSize": 32,
 					"code": 73,
 					"name": "icon-arrows-out",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 25,
@@ -314,7 +282,7 @@
 					"prevSize": 32,
 					"code": 58893,
 					"name": "icon-arrows-right-left",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 33,
@@ -322,7 +290,7 @@
 					"prevSize": 32,
 					"code": 53,
 					"name": "icon-arrows-up-down",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 26,
@@ -330,7 +298,7 @@
 					"prevSize": 32,
 					"code": 42,
 					"name": "icon-asterisk",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 27,
@@ -338,7 +306,7 @@
 					"prevSize": 32,
 					"code": 72,
 					"name": "icon-autoflow-tabular",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 28,
@@ -346,7 +314,7 @@
 					"prevSize": 32,
 					"code": 224,
 					"name": "icon-box",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 29,
@@ -354,7 +322,7 @@
 					"prevSize": 32,
 					"code": 50,
 					"name": "icon-check",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 30,
@@ -362,7 +330,7 @@
 					"prevSize": 32,
 					"code": 67,
 					"name": "icon-clock",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 31,
@@ -370,7 +338,7 @@
 					"prevSize": 32,
 					"code": 46,
 					"name": "icon-connectivity",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 32,
@@ -378,7 +346,7 @@
 					"prevSize": 32,
 					"code": 100,
 					"name": "icon-database-query",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 17,
@@ -386,7 +354,7 @@
 					"prevSize": 32,
 					"code": 68,
 					"name": "icon-database",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 35,
@@ -394,7 +362,7 @@
 					"prevSize": 32,
 					"code": 81,
 					"name": "icon-dictionary",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 36,
@@ -402,7 +370,7 @@
 					"prevSize": 32,
 					"code": 242,
 					"name": "icon-duplicate",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 37,
@@ -410,7 +378,7 @@
 					"prevSize": 32,
 					"code": 102,
 					"name": "icon-folder-new",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 38,
@@ -418,7 +386,7 @@
 					"prevSize": 32,
 					"code": 70,
 					"name": "icon-folder",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 39,
@@ -426,7 +394,7 @@
 					"prevSize": 32,
 					"code": 95,
 					"name": "icon-fullscreen-collapse",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 40,
@@ -434,7 +402,7 @@
 					"prevSize": 32,
 					"code": 122,
 					"name": "icon-fullscreen-expand",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 41,
@@ -442,7 +410,7 @@
 					"prevSize": 32,
 					"code": 71,
 					"name": "icon-gear",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 49,
@@ -450,7 +418,7 @@
 					"prevSize": 32,
 					"code": 227,
 					"name": "icon-image",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 42,
@@ -458,7 +426,7 @@
 					"prevSize": 32,
 					"code": 225,
 					"name": "icon-layers",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 43,
@@ -466,7 +434,7 @@
 					"prevSize": 32,
 					"code": 76,
 					"name": "icon-layout",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 44,
@@ -474,7 +442,7 @@
 					"prevSize": 32,
 					"code": 226,
 					"name": "icon-line-horz",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 75,
@@ -482,7 +450,7 @@
 					"prevSize": 32,
 					"code": 244,
 					"name": "icon-link",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 46,
@@ -490,7 +458,7 @@
 					"prevSize": 32,
 					"code": 88,
 					"name": "icon-magnify-in",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 47,
@@ -498,7 +466,7 @@
 					"prevSize": 32,
 					"code": 89,
 					"name": "icon-magnify-out",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 48,
@@ -506,7 +474,7 @@
 					"prevSize": 32,
 					"code": 77,
 					"name": "icon-magnify",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 34,
@@ -514,7 +482,7 @@
 					"prevSize": 32,
 					"code": 109,
 					"name": "icon-menu",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 50,
@@ -522,7 +490,7 @@
 					"prevSize": 32,
 					"code": 243,
 					"name": "icon-move",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 51,
@@ -530,7 +498,7 @@
 					"prevSize": 32,
 					"code": 121,
 					"name": "icon-new-window",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 52,
@@ -538,7 +506,7 @@
 					"prevSize": 32,
 					"code": 111,
 					"name": "icon-object",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 73,
@@ -546,7 +514,7 @@
 					"prevSize": 32,
 					"code": 63,
 					"name": "icon-object-unknown",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 53,
@@ -554,7 +522,7 @@
 					"prevSize": 32,
 					"code": 86,
 					"name": "icon-packet",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 54,
@@ -562,7 +530,7 @@
 					"prevSize": 32,
 					"code": 234,
 					"name": "icon-page",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 55,
@@ -570,7 +538,7 @@
 					"prevSize": 32,
 					"code": 241,
 					"name": "icon-pause",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 56,
@@ -578,7 +546,7 @@
 					"prevSize": 32,
 					"code": 112,
 					"name": "icon-pencil",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 65,
@@ -586,7 +554,7 @@
 					"prevSize": 32,
 					"code": 79,
 					"name": "icon-people",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 57,
@@ -594,7 +562,7 @@
 					"prevSize": 32,
 					"code": 239,
 					"name": "icon-play",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 58,
@@ -602,7 +570,7 @@
 					"prevSize": 32,
 					"code": 233,
 					"name": "icon-plot-resource",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 59,
@@ -610,7 +578,7 @@
 					"prevSize": 32,
 					"code": 43,
 					"name": "icon-plus",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 60,
@@ -618,7 +586,7 @@
 					"prevSize": 32,
 					"code": 45,
 					"name": "icon-minus",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 61,
@@ -626,7 +594,7 @@
 					"prevSize": 32,
 					"code": 54,
 					"name": "icon-sine",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 62,
@@ -634,7 +602,7 @@
 					"prevSize": 32,
 					"code": 228,
 					"name": "icon-T",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 63,
@@ -642,7 +610,7 @@
 					"prevSize": 32,
 					"code": 116,
 					"name": "icon-telemetry-panel",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 64,
@@ -650,7 +618,7 @@
 					"prevSize": 32,
 					"code": 84,
 					"name": "icon-telemetry",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 18,
@@ -658,7 +626,7 @@
 					"prevSize": 32,
 					"code": 246,
 					"name": "icon-thumbs-strip",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 67,
@@ -666,7 +634,7 @@
 					"prevSize": 32,
 					"code": 83,
 					"name": "icon-timeline",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 68,
@@ -674,7 +642,7 @@
 					"prevSize": 32,
 					"code": 245,
 					"name": "icon-timer",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 69,
@@ -682,7 +650,7 @@
 					"prevSize": 32,
 					"code": 90,
 					"name": "icon-trash",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 70,
@@ -690,7 +658,7 @@
 					"prevSize": 32,
 					"code": 229,
 					"name": "icon-two-parts-both",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 71,
@@ -698,7 +666,7 @@
 					"prevSize": 32,
 					"code": 231,
 					"name": "icon-two-parts-one-only",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 72,
@@ -706,7 +674,7 @@
 					"prevSize": 32,
 					"code": 120,
 					"name": "icon-x-heavy",
-					"tempChar": ""
+					"tempChar": ""
 				},
 				{
 					"order": 66,
@@ -714,7 +682,7 @@
 					"prevSize": 32,
 					"code": 58946,
 					"name": "icon-x",
-					"tempChar": ""
+					"tempChar": ""
 				}
 			],
 			"id": 2,
@@ -729,110 +697,6 @@
 			"height": 1024,
 			"prevSize": 32,
 			"icons": [
-				{
-					"id": 93,
-					"paths": [
-						"M512 64c-261 0-480.6 195.4-512 448 31.4 252.6 251 448 512 448s480.6-195.4 512-448c-31.4-252.6-251-448-512-448zM768.2 734.6c-71.4 62.8-162.8 97.4-257.6 97.4s-186.2-34.6-257.6-97.4c-66.6-58.6-110.6-137.2-125-222.6 0 0 0-0.2 0-0.2 76.8-154 220.8-257.6 384-257.6s307.2 103.8 384 257.6c0 0 0 0.2 0 0.2-14.4 85.4-61.2 164-127.8 222.6z",
-						"M512 288c-123.8 0-224 100.2-224 224s100.2 224 224 224 224-100.2 224-224-100.2-224-224-224zM576 544c-53 0-96-43-96-96s43-96 96-96 96 43 96 96c0 53-43 96-96 96z"
-					],
-					"attrs": [
-						{
-							"fill": "rgb(6, 161, 75)"
-						},
-						{
-							"fill": "rgb(6, 161, 75)"
-						}
-					],
-					"isMulticolor": false,
-					"grid": 0,
-					"tags": [
-						"icon-eye-open-no-gleam"
-					],
-					"colorPermutations": {
-						"125525525516161751": [
-							1,
-							1
-						]
-					}
-				},
-				{
-					"id": 92,
-					"paths": [
-						"M512 64c-261 0-480.6 195.4-512 448 31.4 252.6 251 448 512 448s480.6-195.4 512-448c-31.4-252.6-251-448-512-448zM768.2 734.6c-71.4 62.8-162.8 97.4-257.6 97.4s-186.2-34.6-257.6-97.4c-66.6-58.6-110.6-137.2-125-222.6 0 0 0-0.2 0-0.2 76.8-154 220.8-257.6 384-257.6s307.2 103.8 384 257.6c0 0 0 0.2 0 0.2-14.4 85.4-61.2 164-127.8 222.6z",
-						"M512 288c-123.8 0-224 100.2-224 224s100.2 224 224 224 224-100.2 224-224-100.2-224-224-224z"
-					],
-					"attrs": [
-						{
-							"fill": "rgb(6, 161, 75)"
-						},
-						{
-							"fill": "rgb(6, 161, 75)"
-						}
-					],
-					"isMulticolor": false,
-					"grid": 0,
-					"tags": [
-						"icon-crosshair"
-					],
-					"colorPermutations": {
-						"125525525516161751": [
-							1,
-							1
-						]
-					}
-				},
-				{
-					"id": 91,
-					"paths": [
-						"M256 0h-256v1024h256c105.6 0 192-86.4 192-192v-640c0-105.6-86.4-192-192-192z",
-						"M512 320l512 320v-640z"
-					],
-					"attrs": [
-						{
-							"fill": "rgb(0, 0, 0)"
-						},
-						{
-							"fill": "rgb(0, 0, 0)"
-						}
-					],
-					"isMulticolor": false,
-					"grid": 0,
-					"tags": [
-						"icon-collapse-pane-left"
-					],
-					"colorPermutations": {
-						"125525525516161751": [
-							0,
-							0
-						]
-					}
-				},
-				{
-					"id": 90,
-					"paths": [
-						"M768 0h256v1024h-256c-105.6 0-192-86.4-192-192v-640c0-105.6 86.4-192 192-192z",
-						"M512 320l-512 320v-640z"
-					],
-					"attrs": [
-						{
-							"fill": "rgb(0, 0, 0)"
-						},
-						{
-							"fill": "rgb(0, 0, 0)"
-						}
-					],
-					"isMulticolor": false,
-					"grid": 0,
-					"tags": [
-						"icon-collapse-pane-right"
-					],
-					"colorPermutations": {
-						"125525525516161751": [
-							0,
-							0
-						]
-					}
-				},
 				{
 					"id": 89,
 					"paths": [

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

@@ -90,9 +90,5 @@
 <glyph unicode="&#xe610;" glyph-name="icon-bell" d="M512-64c106 0 192 86 192 192h-384c0-106 86-192 192-192zM896 512v64c0 212-172 384-384 384s-384-172-384-384v-64c0-70.6-57.4-128-128-128v-128h1024v128c-70.6 0-128 57.4-128 128z" />
 <glyph unicode="&#xe611;" glyph-name="icon-dataset" d="M896 768h-320c-16.4 16.4-96.8 96.8-109.2 109.2l-37.4 37.4c-25 25-74.2 45.4-109.4 45.4h-256c-35.2 0-64-28.8-64-64v-384c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v128c0 70.4-57.6 128-128 128zM896 512h-768c-70.4 0-128-57.6-128-128v-320c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v320c0 70.4-57.6 128-128 128zM320 64h-128v320h128v-320zM576 64h-128v320h128v-320zM832 64h-128v320h128v-320z" />
 <glyph unicode="&#xe612;" glyph-name="icon-save" d="M192.2 384c-0.2 0-0.2 0 0 0l-0.2-448h640v447.8c0 0 0 0-0.2 0.2h-639.6zM978.8 749.2l-165.4 165.4c-25 25-74.2 45.4-109.4 45.4h-576c-70.4 0-128-57.6-128-128v-768c0-70.4 57.6-128 128-128v448c0 35.2 28.8 64 64 64h640c35.2 0 64-28.8 64-64v-448c70.4 0 128 57.6 128 128v576c0 35.2-20.4 84.4-45.2 109.2zM704 704c0-35.2-28.8-64-64-64h-448c-35.2 0-64 28.8-64 64v192h320v-192h128v192h128v-192z" />
-<glyph unicode="&#xe613;" glyph-name="icon-collapse-pane-left" d="M256 960h-256v-1024h256c105.6 0 192 86.4 192 192v640c0 105.6-86.4 192-192 192zM512 640l512-320v640z" />
-<glyph unicode="&#xe614;" glyph-name="icon-collapse-pane-right" d="M768 960h256v-1024h-256c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192zM512 640l-512-320v640z" />
-<glyph unicode="&#xe615;" glyph-name="icon-eye-open" d="M512 896c-261 0-480.6-195.4-512-448 31.4-252.6 251-448 512-448s480.6 195.4 512 448c-31.4 252.6-251 448-512 448zM768.2 225.4c-71.4-62.8-162.8-97.4-257.6-97.4s-186.2 34.6-257.6 97.4c-66.6 58.6-110.6 137.2-125 222.6 0 0 0 0.2 0 0.2 76.8 154 220.8 257.6 384 257.6s307.2-103.8 384-257.6c0 0 0-0.2 0-0.2-14.4-85.4-61.2-164-127.8-222.6zM512 672c-123.8 0-224-100.2-224-224s100.2-224 224-224 224 100.2 224 224-100.2 224-224 224z" />
-<glyph unicode="&#xe616;" glyph-name="icon-eye-open-no-gleam" d="M512 896c-261 0-480.6-195.4-512-448 31.4-252.6 251-448 512-448s480.6 195.4 512 448c-31.4 252.6-251 448-512 448zM768.2 225.4c-71.4-62.8-162.8-97.4-257.6-97.4s-186.2 34.6-257.6 97.4c-66.6 58.6-110.6 137.2-125 222.6 0 0 0 0.2 0 0.2 76.8 154 220.8 257.6 384 257.6s307.2-103.8 384-257.6c0 0 0-0.2 0-0.2-14.4-85.4-61.2-164-127.8-222.6zM512 672c-123.8 0-224-100.2-224-224s100.2-224 224-224 224 100.2 224 224-100.2 224-224 224zM576 416c-53 0-96 43-96 96s43 96 96 96 96-43 96-96c0-53-43-96-96-96z" />
 <glyph unicode="&#xe642;" glyph-name="icon-x" d="M384 448l-365.332-365.332c-24.89-24.89-24.89-65.62 0-90.51l37.49-37.49c24.89-24.89 65.62-24.89 90.51 0 0 0 365.332 365.332 365.332 365.332l365.332-365.332c24.89-24.89 65.62-24.89 90.51 0l37.49 37.49c24.89 24.89 24.89 65.62 0 90.51l-365.332 365.332c0 0 365.332 365.332 365.332 365.332 24.89 24.89 24.89 65.62 0 90.51l-37.49 37.49c-24.89 24.89-65.62 24.89-90.51 0 0 0-365.332-365.332-365.332-365.332l-365.332 365.332c-24.89 24.89-65.62 24.89-90.51 0l-37.49-37.49c-24.89-24.89-24.89-65.62 0-90.51 0 0 365.332-365.332 365.332-365.332z" />
 </font></defs></svg>