diff --git a/.gitignore b/.gitignore index aacf7f9728..b8eea4a5be 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,7 @@ *.gzip *.tgz *.DS_Store +*.swp # Compiled CSS, unless directly added *.sass-cache diff --git a/README.md b/README.md index e2d3a979d9..b9486dad3c 100644 --- a/README.md +++ b/README.md @@ -9,9 +9,15 @@ Please visit our [Official Site](https://nasa.github.io/openmct/) and [Getting S Try Open MCT now with our [live demo](https://openmct-demo.herokuapp.com/). ![Demo](https://nasa.github.io/openmct/static/res/images/Open-MCT.Browse.Layout.Mars-Weather-1.jpg) +## New API +A new API is currently under development that will deprecate a lot of the documentation currently in the docs directory, however Open MCT will remain compatible with the currently documented API. An updated set of tutorials is being developed with the new API, and progress on this task can be followed in the [associated pull request](https://github.com/nasa/openmct/pull/999). Any code in this branch should be considered experimental, and we welcome any feedback. + +Differences between the two APIs include a move away from a declarative system of JSON configuration files towards an imperative system based on function calls. Developers will be able to extend and build on Open MCT by making direct function calls to a public API. Open MCT is also being refactored to minimize the dependencies that using Open MCT imposes on developers, such as the current requirement to use Angular JS. + ## Building and Running Open MCT Locally Building and running Open MCT in your local dev environment is very easy. Be sure you have [Git](https://git-scm.com/downloads) and [Node.js](https://nodejs.org/) installed, then follow the directions below. Need additional information? Check out the [Getting Started](https://nasa.github.io/openmct/getting-started/) page on our website. +(These instructions assume you are installing as a non-root user; developers have [reported issues](https://github.com/nasa/openmct/issues/1151) running these steps with root privileges.) 1. Clone the source code @@ -31,6 +37,22 @@ Open MCT is now running, and can be accessed by pointing a web browser at [http: Documentation is available on the [Open MCT website](https://nasa.github.io/openmct/documentation/). The documentation can also be built locally. +### Examples + +The clearest examples for developing Open MCT plugins are in the +[tutorials](https://nasa.github.io/openmct/docs/tutorials/) provided in +our documentation. + +For a practical example of a telemetry adapter, see David Hudson's +[Kerbal Space Program plugin](https://github.com/hudsonfoo/kerbal-openmct), +which allows [Kerbal Space Program](https://kerbalspaceprogram.com) players +to build and use displays for their own missions in Open MCT. + +Additional examples are available in the `examples` hierarchy of this +repository; however, be aware that these examples are +[not fully-documented](https://github.com/nasa/openmct/issues/846), so +the tutorials will likely serve as a better starting point. + ### Building the Open MCT Documentation Locally Open MCT's documentation is generated by an [npm](https://www.npmjs.com/)-based build. It has additional dependencies that diff --git a/bower.json b/bower.json index 7c913754cf..419871fe57 100644 --- a/bower.json +++ b/bower.json @@ -13,11 +13,12 @@ "moment-duration-format": "^1.3.0", "requirejs": "~2.1.22", "text": "requirejs-text#^2.0.14", - "es6-promise": "^3.0.2", + "es6-promise": "^3.3.0", "screenfull": "^3.0.0", "node-uuid": "^1.4.7", "comma-separated-values": "^3.6.4", "FileSaver.js": "^0.0.2", - "zepto": "^1.1.6" + "zepto": "^1.1.6", + "html2canvas": "^0.4.1" } } diff --git a/build-docs.sh b/build-docs.sh index ca7dc97c2e..29841f921e 100755 --- a/build-docs.sh +++ b/build-docs.sh @@ -32,7 +32,7 @@ WEBSITE_DIRECTORY="website" BUILD_SHA=`git rev-parse HEAD` # A remote will be created for the git repository we are pushing to. -# Don't worry, as this entire directory will get trashed inbetween builds. +# Don't worry, as this entire directory will get trashed in between builds. REMOTE_NAME="documentation" WEBSITE_BRANCH="master" @@ -45,8 +45,8 @@ npm run docs echo "git clone $REPOSITORY_URL website" git clone $REPOSITORY_URL website || exit 1 -echo "cp -r $OUTPUT_DIRECTORY $WEBSITE_DIRECTORY/docs" -cp -r $OUTPUT_DIRECTORY $WEBSITE_DIRECTORY/docs +echo "cp -r $OUTPUT_DIRECTORY $WEBSITE_DIRECTORY" +cp -r $OUTPUT_DIRECTORY $WEBSITE_DIRECTORY echo "cd $WEBSITE_DIRECTORY" cd $WEBSITE_DIRECTORY || exit 1 diff --git a/docs/src/architecture/index.md b/docs/src/architecture/index.md index a4586a3542..6f2fbcfcef 100644 --- a/docs/src/architecture/index.md +++ b/docs/src/architecture/index.md @@ -6,7 +6,7 @@ overall architecture of Open MCT. The target audience includes: * _Platform maintainers_: Individuals involved in developing, - extending, and maintaing capabilities of the platform. + extending, and maintaining capabilities of the platform. * _Integration developers_: Individuals tasked with integrated Open MCT into a larger system, who need to understand its inner workings sufficiently to complete this integration. @@ -63,7 +63,7 @@ These layers are: 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, +* [_Platform_](platform.md): The platform layer defines the general look, feel, and behavior of Open MCT. 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. @@ -74,5 +74,3 @@ These layers are: typically consists of a mix of custom plug-ins to Open MCT, as well as optional features (such as Plot view) included alongside the platform. - - diff --git a/docs/src/architecture/platform.md b/docs/src/architecture/platform.md index 1f5e087a11..48ceebb9ef 100644 --- a/docs/src/architecture/platform.md +++ b/docs/src/architecture/platform.md @@ -1,6 +1,6 @@ # Overview -The Open MCT platform utilizes the [framework layer](Framework.md) +The Open MCT platform utilizes the [framework layer](framework.md) to provide an extensible baseline for applications which includes: * A common user interface (and user interface paradigm) for dealing with @@ -38,7 +38,7 @@ in __any of these tiers__. 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  + stylesheets (controlling the look-and-feel of the rendered templates) belong  in this grouping as well.  * [_Presentation layer_](#presentation-layer): The presentation layer is responsible for updating (and providing information to update) @@ -48,7 +48,7 @@ in __any of these tiers__. 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  + 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  @@ -616,7 +616,7 @@ follows: part of an action's extension definition. * `CreateActionProvider` provides the various Create actions which populate the Create menu. These are driven by the available types, - so do not map easily ot extension category `actions`; instead, these + so do not map easily to extension category `actions`; instead, these are generated after looking up which actions are available from the [`TypeService`](#type-service). * `ActionAggregator` merges together actions from multiple providers. diff --git a/docs/src/design/proposals/APIRedesign.md b/docs/src/design/proposals/APIRedesign.md index d14f4ce469..03ce2f212f 100644 --- a/docs/src/design/proposals/APIRedesign.md +++ b/docs/src/design/proposals/APIRedesign.md @@ -98,7 +98,7 @@ Worked on bug fixes in the platform and a plugin for search. It is hard to figure out what the difference between the various ways of dealing with telemetry are. e.g., what is the difference between just "Telemetry" and the "Telemetry Service"? There are many - "Telemetry Thing"s which seem related, but in an unclear way. + "Telemetry Things" which seem related, but in an unclear way. ### Developer Intern 2 @@ -180,7 +180,7 @@ to develop a tabular visualization plugin. * Add a model property to the bundle.json to take in "Hello World" as a parameter and pass through to the controller/view -### Open Source Contributer +### Open Source Contributor * [Failures are non-graceful when services are missing.]( https://github.com/nasa/openmctweb/issues/79) @@ -214,7 +214,7 @@ to an entirely different framework. We can expect AngularJS 1.x to reach end-of-life reasonably soon thereafter. -Our API is currently a superset of Angular's API, so this directly effects +Our API is currently a superset of Angular's API, so this directly affects our API. Specifically, API changes should be oriented towards removing or reducing the Angular dependency. @@ -456,7 +456,7 @@ Instead, propose that: For parity with actions, a `View` would be a constructor which takes an `ActionContext` as a parameter (with similarly-defined properties) and exposes a method to retrieve the HTML elements -associateed with it. +associated with it. The platform would then additionally expose an `AngularView` implementation to improve compatibility with existing diff --git a/docs/src/design/proposals/APIRedesign_PeteRichards.md b/docs/src/design/proposals/APIRedesign_PeteRichards.md index 3fa78fe2ed..517d61cc50 100644 --- a/docs/src/design/proposals/APIRedesign_PeteRichards.md +++ b/docs/src/design/proposals/APIRedesign_PeteRichards.md @@ -3,7 +3,7 @@ **Table of Contents** *generated with [DocToc](https://github.com/thlorenz/doctoc)* - [Reducing interface depth (the bundle.json version)](#reducing-interface-depth-the-bundlejson-version) - - [Imperitive component registries](#imperitive-component-registries) + - [Imperitive component registries](#imperative-component-registries) - [Get rid of "extension category" concept.](#get-rid-of-extension-category-concept) - [Reduce number and depth of extension points](#reduce-number-and-depth-of-extension-points) - [Composite services should not be the default](#composite-services-should-not-be-the-default) @@ -30,11 +30,11 @@ # Reducing interface depth (the bundle.json version) -## Imperitive component registries +## Imperative component registries Transition component registries to javascript, get rid of bundle.json and bundles.json. Prescribe a method for application configuration, but allow flexibility in how application configuration is defined. -Register components in an imperitive fashion, see angularApp.factory, angularApp.controller, etc. Alternatively, implement our own application object with new registries and it's own form of registering objects. +Register components in an imperative fashion, see angularApp.factory, angularApp.controller, etc. Alternatively, implement our own application object with new registries and it's own form of registering objects. ## Get rid of "extension category" concept. @@ -99,7 +99,7 @@ To reduce interface depth, we can replace our own provider and registry patterns ## More angular: for all services -Increasing our commitment to angular would mean using more of the angular factorys, services, etc, and less of our home grown tools. We'd implement our services and extension points as angular providers, and make them configurable via app.config. +Increasing our commitment to angular would mean using more of the angular factories, services, etc, and less of our home grown tools. We'd implement our services and extension points as angular providers, and make them configurable via app.config. As an example, registering a specific type of model provider in angular would look like: @@ -126,9 +126,9 @@ Allow developers to use whatever module loading system they'd like to use, while ## Use gulp or grunt for standard tooling -Using gulp or grunt as a task runner would bring us in line with standard web developer workflows and help standardize rendering, deployment, and packaging. Additional tools can be added to the workflow at low cost, simplifying the set up of developer environments. +Using gulp or grunt as a task runner would bring us in line with standard web developer workflows and help standardize rendering, deployment, and packaging. Additional tools can be added to the workflow at low cost, simplifying the setup of developer environments. -Gulp and grunt provide useful developer tooling such as live reload, automatic scss/less/etc compiliation, and ease of extensibility for standard production build processes. They're key in decoupling code. +Gulp and grunt provide useful developer tooling such as live reload, automatic scss/less/etc compilation, and ease of extensibility for standard production build processes. They're key in decoupling code. ## Package openmctweb as single versioned file. diff --git a/docs/src/guide/index.md b/docs/src/guide/index.md index 081f1df45a..1d8a422299 100644 --- a/docs/src/guide/index.md +++ b/docs/src/guide/index.md @@ -643,7 +643,7 @@ to be passed along by other services. ## Domain Objects Domain objects are the most fundamental component of Open MCT's information -model. A domain object is some distinct thing relevant to a user's work flow, +model. A domain object is some distinct thing relevant to a user's workflow, such as a telemetry channel, display, or similar. Open MCT is a tool for viewing, browsing, manipulating, and otherwise interacting with a graph of domain objects. @@ -933,7 +933,7 @@ Note that `templateUrl` is not supported for `containers`. Controls provide options for the `mct-control` directive. -Six standard control types are included in the forms bundle: +Ten standard control types are included in the forms bundle: * `textfield`: An area to enter plain text. * `select`: A drop-down list of options. @@ -941,7 +941,13 @@ Six standard control types are included in the forms bundle: * `color`: A color picker. * `button`: A button. * `datetime`: An input for UTC date/time entry; gives result as a UNIX -timestamp, in milliseconds since start of 1970, UTC. +timestamp, in milliseconds since start of 1970, UTC. +* `composite`: A control parenting an array of other controls. +* `menu-button`: A drop-down list of items supporting custom behavior +on click. +* `dialog-button`: A button which opens a dialog allowing a single property +to be edited. +* `radio`: A radio button. New controls may be added as extensions of the controls category. Extensions of this category have two properties: @@ -981,7 +987,7 @@ Examples of gestures included in the platform are: composition. * `drop`: For representations that can be drop targets for drag-and-drop composition. -* `menu`: For representations that can be used to pop up a context menu. +* `menu`: For representations that can be used to popup a context menu. Gesture definitions have a property `key` which is used as a machine-readable identifier for the gesture (e.g. `drag`, `drop`, `menu` above.) @@ -1153,7 +1159,7 @@ For example, the _My Items_ folder is added as an extension of this category. Extensions of this category should have the following properties: -* `id`: The machine-readable identifier for the domaiwn object being exposed. +* `id`: The machine-readable identifier for the domain object being exposed. * `model`: The model, as a JSON object, for the domain object being exposed. ## Stylesheets Category diff --git a/docs/src/process/testing/plan.md b/docs/src/process/testing/plan.md index 47ab60ee34..34e75855c9 100644 --- a/docs/src/process/testing/plan.md +++ b/docs/src/process/testing/plan.md @@ -102,7 +102,7 @@ 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) +* [_Long-duration testing_](procedures.md#long-duration-testing) (specifically, for 24 hours.) Issues are reported as a product of both forms of testing. diff --git a/docs/src/tutorials/index.md b/docs/src/tutorials/index.md index 84c571bec8..d8842de9d7 100644 --- a/docs/src/tutorials/index.md +++ b/docs/src/tutorials/index.md @@ -48,17 +48,17 @@ for a more general overview of how to run and deploy a Open MCT application. First step is to check out Open MCT from the source repository. -`git clone https://github.com/nasa/openmctweb.git openmctweb` +`git clone https://github.com/nasa/openmct.git openmct` This will create a copy of the Open MCT source code repository in the folder -`openmctweb` (relative to the path from which you ran the command.) +`openmct` (relative to the path from which you ran the command.) If you have a repository URL, use that as the "path to repo" above. Alternately, if you received Open MCT as a git bundle, the path to that bundle on the local filesystem can be used instead. At this point, it will also be useful to branch off of Open MCT v0.6.2 (which was used when writing these tutorials) to begin adding plugins. - cd openmctweb + cd openmct git branch open-v0.6.2 git checkout @@ -79,7 +79,7 @@ changes to stylesheets, or you are running the minified version of the app The next step is to run a web server so that you can view the Open MCT client (including the plugins you add to it) in browser. Any web server can -be used for hosting OpenMCTWeb, and a trivial web server is provided in this +be used for hosting Open MCT, and a trivial web server is provided in this package for the purposes of running the tutorials. The provided web server should not be used in a production environment @@ -91,7 +91,7 @@ To run the tutorial web server Once running, you should be able to view Open MCT from your browser at http://localhost:8080/ (assuming the web server is running on port 8080, -and OpenMCTWeb is installed at the server's root path). +and Open MCT is installed at the server's root path). [Google Chrome](https://www.google.com/chrome/) is recommended for these tutorials, as Chrome is Open MCT's "test-to" browser. The browser cache can sometimes interfere with development (masking changes by @@ -130,7 +130,6 @@ to this plugin as tutorials/todo as well.) We will start with an "empty bundle", one which exposes no extensions - which looks like: ```diff - define([ 'legacyRegistry' ], function ( @@ -144,7 +143,6 @@ define([ } }); }); - ``` __tutorials/todo/bundle.js__ @@ -348,7 +346,8 @@ deeper explanation of domain objects, see the Open MCT Developer Guide.) In the case of our to-do list feature, the to-do list itself is the thing we'll want users to be able to create and edit. So, we will add that as a new type in our bundle definition: -```diff + +```diff define([ 'legacyRegistry' ], function ( @@ -370,7 +369,6 @@ define([ + ]} }); }); - ``` __tutorials/todo/bundle.js__ @@ -427,7 +425,6 @@ are stored by convention.) ``` - __tutorials/todo/res/templates/todo.html__ A summary of what's included: @@ -573,6 +570,7 @@ We will define that in an AMD module (see http://requirejs.org/docs/whyamd.html) in the directory `tutorials/todo/src/controllers` (`src` is, by default, the directory where bundle-related source code is kept, and controllers is where Angular controllers are stored by convention.) + ```diff define(function () { function TodoController($scope) { @@ -971,6 +969,7 @@ by the tool bar we've defined. Additionally, we need to make changes to our template to select specific tasks in response to some user gesture. Here, we will select tasks when a user clicks the description. + ```diff
@@ -996,6 +995,7 @@ __tutorials/todo/res/templates/todo.html__ Finally, the `TodoController` uses the `dialogService` now, so we need to declare that dependency in its extension definition: + ```diff define([ 'legacyRegistry', @@ -1248,7 +1248,6 @@ another file to the res directory of our bundle; this time, it is `css/todo.css` font-style: italic; } ``` - __tutorials/todo/res/css/todo.css__ Here, we have defined classes and appearances for: @@ -1261,6 +1260,7 @@ Here, we have defined classes and appearances for: To include this CSS file in our running instance of Open MCT, we need to declare it in our bundle definition, this time as an extension of category `stylesheets`: + ```diff define([ 'legacyRegistry', @@ -1430,7 +1430,6 @@ define([ }); }); ``` - __tutorials/bargraph/bundle.js__ The view definition should look familiar after the To-Do List tutorial, with @@ -1499,6 +1498,7 @@ The third is for labels along the horizontal axis, which will indicate which bar corresponds to which telemetry point. Inline `style` attributes are used wherever dynamic positioning (handled by a script) is anticipated. The corresponding CSS file which styles and positions these elements: + ```diff .example-bargraph { position: absolute; @@ -1596,6 +1596,7 @@ actual telemetry data in subsequent steps.) Notably, we will not try to show telemetry data after this step. To support this, we will add a new controller which supports our Bar Graph view: + ```diff define(function () { function BarGraphController($scope, telemetryHandler) { @@ -1647,6 +1648,7 @@ Whenever the telemetry handler invokes its callbacks, we update the set of telemetry objects in view, as well as the width for each bar. We will also utilize this from our template: + ```diff +
@@ -2346,6 +2348,7 @@ add a top-level object which will serve as a container; in the next step, we will populate this with the contents of the telemetry dictionary (which we will retrieve from the server.) +```diff define([ 'legacyRegistry' ], function ( @@ -2375,6 +2378,7 @@ define([ } }); }); +``` __tutorials/telemetry/bundle.js__ Here, we've created our initial telemetry plugin. This exposes a new domain @@ -2469,7 +2473,6 @@ define([ }; }); ``` - __main.js__ ...we will be able to reload Open MCT and see that it is present: @@ -2486,43 +2489,45 @@ server. Our first step will be to add a service that will handle interactions with the server; this will not be used by Open MCT directly, but will be used by subsequent components we add. - /*global define,WebSocket*/ - - define( - [], - function () { - "use strict"; - - function ExampleTelemetryServerAdapter($q, wsUrl) { - var ws = new WebSocket(wsUrl), - dictionary = $q.defer(); - - // Handle an incoming message from the server - ws.onmessage = function (event) { - var message = JSON.parse(event.data); - - switch (message.type) { - case "dictionary": - dictionary.resolve(message.value); - break; - } - }; - - // Request dictionary once connection is established - ws.onopen = function () { - ws.send("dictionary"); - }; - - return { - dictionary: function () { - return dictionary.promise; - } - }; - } - - return ExampleTelemetryServerAdapter; +```diff +/*global define,WebSocket*/ + +define( + [], + function () { + "use strict"; + + function ExampleTelemetryServerAdapter($q, wsUrl) { + var ws = new WebSocket(wsUrl), + dictionary = $q.defer(); + + // Handle an incoming message from the server + ws.onmessage = function (event) { + var message = JSON.parse(event.data); + + switch (message.type) { + case "dictionary": + dictionary.resolve(message.value); + break; + } + }; + + // Request dictionary once connection is established + ws.onopen = function () { + ws.send("dictionary"); + }; + + return { + dictionary: function () { + return dictionary.promise; + } + }; } - ); + + return ExampleTelemetryServerAdapter; + } +); +``` __tutorials/telemetry/src/ExampleTelemetryServerAdapter.js__ When created, this service initiates a connection to the server, and begins @@ -2539,86 +2544,88 @@ subsystems. This means that we need to convert the data from the dictionary into domain object models, and expose these to Open MCT via a `modelService`. - /*global define*/ - - define( - function () { - "use strict"; - - var PREFIX = "example_tlm:", - FORMAT_MAPPINGS = { - float: "number", - integer: "number", - string: "string" - }; - - function ExampleTelemetryModelProvider(adapter, $q) { - var modelPromise, empty = $q.when({}); - - // Check if this model is in our dictionary (by prefix) - function isRelevant(id) { - return id.indexOf(PREFIX) === 0; - } - - // Build a domain object identifier by adding a prefix - function makeId(element) { - return PREFIX + element.identifier; - } - - // Create domain object models from this dictionary - function buildTaxonomy(dictionary) { - var models = {}; - - // Create & store a domain object model for a measurement - function addMeasurement(measurement) { - var format = FORMAT_MAPPINGS[measurement.type]; - models[makeId(measurement)] = { - type: "example.measurement", - name: measurement.name, - telemetry: { - key: measurement.identifier, - ranges: [{ - key: "value", - name: "Value", - units: measurement.units, - format: format - }] - } - }; - } - - // Create & store a domain object model for a subsystem - function addSubsystem(subsystem) { - var measurements = - (subsystem.measurements || []); - models[makeId(subsystem)] = { - type: "example.subsystem", - name: subsystem.name, - composition: measurements.map(makeId) - }; - measurements.forEach(addMeasurement); - } - - (dictionary.subsystems || []).forEach(addSubsystem); - - return models; - } - - // Begin generating models once the dictionary is available - modelPromise = adapter.dictionary().then(buildTaxonomy); - - return { - getModels: function (ids) { - // Return models for the dictionary only when they - // are relevant to the request. - return ids.some(isRelevant) ? modelPromise : empty; - } - }; +```diff +/*global define*/ + +define( + function () { + "use strict"; + + var PREFIX = "example_tlm:", + FORMAT_MAPPINGS = { + float: "number", + integer: "number", + string: "string" + }; + + function ExampleTelemetryModelProvider(adapter, $q) { + var modelPromise, empty = $q.when({}); + + // Check if this model is in our dictionary (by prefix) + function isRelevant(id) { + return id.indexOf(PREFIX) === 0; } - - return ExampleTelemetryModelProvider; + + // Build a domain object identifier by adding a prefix + function makeId(element) { + return PREFIX + element.identifier; + } + + // Create domain object models from this dictionary + function buildTaxonomy(dictionary) { + var models = {}; + + // Create & store a domain object model for a measurement + function addMeasurement(measurement) { + var format = FORMAT_MAPPINGS[measurement.type]; + models[makeId(measurement)] = { + type: "example.measurement", + name: measurement.name, + telemetry: { + key: measurement.identifier, + ranges: [{ + key: "value", + name: "Value", + units: measurement.units, + format: format + }] + } + }; + } + + // Create & store a domain object model for a subsystem + function addSubsystem(subsystem) { + var measurements = + (subsystem.measurements || []); + models[makeId(subsystem)] = { + type: "example.subsystem", + name: subsystem.name, + composition: measurements.map(makeId) + }; + measurements.forEach(addMeasurement); + } + + (dictionary.subsystems || []).forEach(addSubsystem); + + return models; + } + + // Begin generating models once the dictionary is available + modelPromise = adapter.dictionary().then(buildTaxonomy); + + return { + getModels: function (ids) { + // Return models for the dictionary only when they + // are relevant to the request. + return ids.some(isRelevant) ? modelPromise : empty; + } + }; } - ); + + return ExampleTelemetryModelProvider; + } +); +``` __tutorials/telemetry/src/ExampleTelemetryModelProvider.js__ This script implements a `provider` for `modelService`; the `modelService` is a @@ -2671,55 +2678,57 @@ This allows our telemetry dictionary to be expressed as domain object models fix this, we will need another script which will add these subsystems to the root-level object we added in Step 1. - /*global define*/ - - define( - function () { - "use strict"; - - var TAXONOMY_ID = "example:sc", - PREFIX = "example_tlm:"; - - function ExampleTelemetryInitializer(adapter, objectService) { - // Generate a domain object identifier for a dictionary element - function makeId(element) { - return PREFIX + element.identifier; - } - - // When the dictionary is available, add all subsystems - // to the composition of My Spacecraft - function initializeTaxonomy(dictionary) { - // Get the top-level container for dictionary objects - // from a group of domain objects. - function getTaxonomyObject(domainObjects) { - return domainObjects[TAXONOMY_ID]; - } - - // Populate - function populateModel(taxonomyObject) { - return taxonomyObject.useCapability( - "mutation", - function (model) { - model.name = - dictionary.name; - model.composition = - dictionary.subsystems.map(makeId); - } - ); - } - - // Look up My Spacecraft, and populate it accordingly. - objectService.getObjects([TAXONOMY_ID]) - .then(getTaxonomyObject) - .then(populateModel); - } - - adapter.dictionary().then(initializeTaxonomy); +```diff +/*global define*/ + +define( + function () { + "use strict"; + + var TAXONOMY_ID = "example:sc", + PREFIX = "example_tlm:"; + + function ExampleTelemetryInitializer(adapter, objectService) { + // Generate a domain object identifier for a dictionary element + function makeId(element) { + return PREFIX + element.identifier; } - - return ExampleTelemetryInitializer; + + // When the dictionary is available, add all subsystems + // to the composition of My Spacecraft + function initializeTaxonomy(dictionary) { + // Get the top-level container for dictionary objects + // from a group of domain objects. + function getTaxonomyObject(domainObjects) { + return domainObjects[TAXONOMY_ID]; + } + + // Populate + function populateModel(taxonomyObject) { + return taxonomyObject.useCapability( + "mutation", + function (model) { + model.name = + dictionary.name; + model.composition = + dictionary.subsystems.map(makeId); + } + ); + } + + // Look up My Spacecraft, and populate it accordingly. + objectService.getObjects([TAXONOMY_ID]) + .then(getTaxonomyObject) + .then(populateModel); + } + + adapter.dictionary().then(initializeTaxonomy); } - ); + + return ExampleTelemetryInitializer; + } +); +``` __tutorials/telemetry/src/ExampleTelemetryInitializer.js__ At the conclusion of Step 1, the top-level My Spacecraft object was empty. This @@ -2737,14 +2746,14 @@ with the platform): ```diff define([ 'legacyRegistry', - './src/ExampleTelemetryServerAdapter', - './src/ExampleTelemetryInitializer', - './src/ExampleTelemetryModelProvider' ++ './src/ExampleTelemetryServerAdapter', ++ './src/ExampleTelemetryInitializer', ++ './src/ExampleTelemetryModelProvider' ], function ( legacyRegistry, - ExampleTelemetryServerAdapter, - ExampleTelemetryInitializer, - ExampleTelemetryModelProvider ++ ExampleTelemetryServerAdapter, ++ ExampleTelemetryInitializer, ++ ExampleTelemetryModelProvider ) { legacyRegistry.register("tutorials/telemetry", { "name": "Example Telemetry Adapter", @@ -2755,7 +2764,7 @@ define([ "key": "example.spacecraft", "glyph": "o" }, - { ++ { + "name": "Subsystem", + "key": "example.subsystem", + "glyph": "o", @@ -2934,6 +2943,7 @@ identifier, the pending promise is resolved. This `history` method will be used by a `telemetryService` provider which we will implement: + ```diff /*global define*/ @@ -3019,6 +3029,7 @@ Finally, note that we also have a `subscribe` method, to satisfy the interface o `telemetryService`, but this `subscribe` method currently does nothing. This script uses an `ExampleTelemetrySeries` class, which looks like: + ```diff /*global define*/ @@ -3050,6 +3061,7 @@ This takes the array of telemetry values (as returned by the server) and wraps it with the interface expected by the platform (the methods shown.) Finally, we expose this `telemetryService` provider declaratively: + ```diff define([ 'legacyRegistry', @@ -3226,7 +3238,7 @@ define( __tutorials/telemetry/src/ExampleTelemetryServerAdapter.js__ Here, we have added `subscribe` and `unsubscribe` methods which issue the -corresponding requests to the server. Seperately, we introduce the ability to +corresponding requests to the server. Separately, we introduce the ability to listen for `data` messages as they come in: These will contain the data associated with these subscriptions. @@ -3316,7 +3328,6 @@ define( } ); ``` - __tutorials/telemetry/src/ExampleTelemetryProvider.js__ A quick summary of these changes: diff --git a/example/eventGenerator/bundle.js b/example/eventGenerator/bundle.js index 60b91bbb9c..157fa62542 100644 --- a/example/eventGenerator/bundle.js +++ b/example/eventGenerator/bundle.js @@ -49,7 +49,7 @@ define([ { "key": "eventGenerator", "name": "Event Message Generator", - "glyph": "\u0066", + "cssclass": "icon-folder-new", "description": "For development use. Creates sample event message data that mimics a live data stream.", "priority": 10, "features": "creation", diff --git a/example/eventGenerator/data/transcript.json b/example/eventGenerator/data/transcript.json index 0416220e71..ce78735330 100644 --- a/example/eventGenerator/data/transcript.json +++ b/example/eventGenerator/data/transcript.json @@ -10,7 +10,7 @@ "LMP: 47 degrees.", "CC: Eagle, looking great. You're GO.", "CC: Roger. 1202. We copy it.", - "O1: LMP 35 degrees. 35 degrees. 750. Coming aown to 23.fl", + "O1: LMP 35 degrees. 35 degrees. 750. Coming down to 23.fl", "LMP: 700 feet, 21 down, 33 degrees.", "LMP: 600 feet, down at 19.", "LMP: 540 feet, down at - 30. Down at 15.", diff --git a/example/export/bundle.js b/example/export/bundle.js index fca07b789d..5322d53a83 100644 --- a/example/export/bundle.js +++ b/example/export/bundle.js @@ -36,7 +36,7 @@ define([ "name": "Export Telemetry as CSV", "implementation": ExportTelemetryAsCSVAction, "category": "contextual", - "glyph": "\u0033", + "cssclass": "icon-download", "depends": [ "exportService" ] } ] diff --git a/example/forms/res/templates/exampleForm.html b/example/forms/res/templates/exampleForm.html index 7d6e34b7dc..a315d7c9c9 100644 --- a/example/forms/res/templates/exampleForm.html +++ b/example/forms/res/templates/exampleForm.html @@ -20,12 +20,14 @@ at runtime from the About dialog for additional information. -->
- - - - - + +
  • Dirty: {{aForm.$dirty}}
    • @@ -33,11 +35,8 @@ 
-
-
-    
-
+
\ No newline at end of file diff --git a/example/forms/src/ExampleFormController.js b/example/forms/src/ExampleFormController.js index dea579f075..f3f8c95a4e 100644 --- a/example/forms/src/ExampleFormController.js +++ b/example/forms/src/ExampleFormController.js @@ -78,27 +78,26 @@ define( items: [ { control: "button", - glyph: "1", - description: "Button A", + csslass: "icon-save", click: function () { - window.alert("A"); + window.alert("Save"); } }, { control: "button", - glyph: "2", + csslass: "icon-x", description: "Button B", click: function () { - window.alert("B"); + window.alert("Cancel"); } }, { control: "button", - glyph: "3", + csslass: "icon-trash", description: "Button C", disabled: true, click: function () { - window.alert("C"); + window.alert("Delete"); } } ] diff --git a/example/generator/bundle.js b/example/generator/bundle.js index e4e719149a..0eadfad5e9 100644 --- a/example/generator/bundle.js +++ b/example/generator/bundle.js @@ -86,7 +86,7 @@ define([ { "key": "generator", "name": "Sine Wave Generator", - "glyph": "\u0054", + "cssclass": "icon-telemetry", "description": "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.", "priority": 10, "features": "creation", diff --git a/example/imagery/bundle.js b/example/imagery/bundle.js index d0304f3f98..6232229e40 100644 --- a/example/imagery/bundle.js +++ b/example/imagery/bundle.js @@ -49,7 +49,7 @@ define([ { "key": "imagery", "name": "Example Imagery", - "glyph": "\u00e3", + "cssclass": "icon-image", "features": "creation", "description": "For development use. Creates example imagery data that mimics a live imagery stream.", "priority": 10, diff --git a/example/mobile/res/sass/mobile-example.scss b/example/mobile/res/sass/mobile-example.scss index f9f004baa4..99c14d305b 100644 --- a/example/mobile/res/sass/mobile-example.scss +++ b/example/mobile/res/sass/mobile-example.scss @@ -25,7 +25,7 @@ @include phoneandtablet { // Show the Create button - .create-btn-holder { + .create-button-holder { display: block !important; } } diff --git a/example/msl/bundle.js b/example/msl/bundle.js index 15c8191574..aefc3ffc16 100644 --- a/example/msl/bundle.js +++ b/example/msl/bundle.js @@ -43,18 +43,18 @@ define([ { "name":"Mars Science Laboratory", "key": "msl.curiosity", - "glyph": "o" + "cssclass": "icon-object" }, { "name": "Instrument", "key": "msl.instrument", - "glyph": "o", + "cssclass": "icon-object", "model": {"composition": []} }, { "name": "Measurement", "key": "msl.measurement", - "glyph": "\u0054", + "cssclass": "icon-telemetry", "model": {"telemetry": {}}, "telemetry": { "source": "rems.source", diff --git a/example/notifications/res/dialog-launch.html b/example/notifications/res/dialog-launch.html index 9eebd2e3e5..c810f7f605 100644 --- a/example/notifications/res/dialog-launch.html +++ b/example/notifications/res/dialog-launch.html @@ -1,9 +1,9 @@ - + - + Known | Unknown | Error | Info - Dialogs + \ No newline at end of file diff --git a/example/notifications/res/notification-launch.html b/example/notifications/res/notification-launch.html index e5f5cbac6b..41aee23e63 100644 --- a/example/notifications/res/notification-launch.html +++ b/example/notifications/res/notification-launch.html @@ -1,9 +1,9 @@ - + - + Success | Error | Alert | Progress - Notifications + \ No newline at end of file diff --git a/example/notifications/src/DialogLaunchIndicator.js b/example/notifications/src/DialogLaunchIndicator.js index 4a9a67689e..3d30e84be5 100644 --- a/example/notifications/src/DialogLaunchIndicator.js +++ b/example/notifications/src/DialogLaunchIndicator.js @@ -32,17 +32,15 @@ define( * launched for demonstration and testing purposes. * @constructor */ + function DialogLaunchIndicator() { } DialogLaunchIndicator.template = 'dialogLaunchTemplate'; - DialogLaunchIndicator.prototype.getGlyph = function () { - return "i"; - }; DialogLaunchIndicator.prototype.getGlyphClass = function () { - return 'caution'; + return 'ok'; }; DialogLaunchIndicator.prototype.getText = function () { return "Launch test dialog"; diff --git a/example/notifications/src/NotificationLaunchIndicator.js b/example/notifications/src/NotificationLaunchIndicator.js index 8c48d05bee..b839fa81d6 100644 --- a/example/notifications/src/NotificationLaunchIndicator.js +++ b/example/notifications/src/NotificationLaunchIndicator.js @@ -26,17 +26,21 @@ define( function () { "use strict"; + /** + * A tool for manually invoking notifications. When included this + * indicator will allow for notifications of different types to be + * launched for demonstration and testing purposes. + * @constructor + */ + function NotificationLaunchIndicator() { } NotificationLaunchIndicator.template = 'notificationLaunchTemplate'; - NotificationLaunchIndicator.prototype.getGlyph = function () { - return "i"; - }; NotificationLaunchIndicator.prototype.getGlyphClass = function () { - return 'caution'; + return 'ok'; }; NotificationLaunchIndicator.prototype.getText = function () { return "Launch notification"; diff --git a/example/plotOptions/bundle.js b/example/plotOptions/bundle.js index 25a78584b1..ae47d2a97c 100644 --- a/example/plotOptions/bundle.js +++ b/example/plotOptions/bundle.js @@ -81,7 +81,7 @@ define([ { "key": "plot", "name": "Example Telemetry Plot", - "glyph": "\u0074", + "cssclass": "icon-telemetry-panel", "description": "For development use. A plot for displaying telemetry.", "priority": 10, "delegates": [ @@ -129,7 +129,7 @@ define([ { "name": "Period", "control": "textfield", - "cssclass": "l-small l-numeric", + "cssclass": "l-input-sm l-numeric", "key": "period", "required": true, "property": [ diff --git a/example/profiling/src/DigestIndicator.js b/example/profiling/src/DigestIndicator.js index 1de2d0e973..826dd2f23f 100644 --- a/example/profiling/src/DigestIndicator.js +++ b/example/profiling/src/DigestIndicator.js @@ -59,11 +59,14 @@ define( update(); return { - getGlyph: function () { - return "."; - }, - getGlyphClass: function () { - return undefined; + /** + * Get the CSS class that defines the icon + * to display in this indicator. This will appear + * as a dataflow icon. + * @returns {string} the cssclass of the dataflow icon + */ + getCssClass: function () { + return "icon-connectivity"; }, getText: function () { return displayed + " digests/sec"; diff --git a/example/profiling/src/WatchIndicator.js b/example/profiling/src/WatchIndicator.js index f999de7e01..1e9ef5e386 100644 --- a/example/profiling/src/WatchIndicator.js +++ b/example/profiling/src/WatchIndicator.js @@ -55,24 +55,13 @@ define( return { /** - * Get the glyph (single character used as an icon) + * Get the CSS class (single character used as an icon) * to display in this indicator. This will return ".", - * which should appear as a dataflow icon. + * which should appear as a database icon. * @returns {string} the character of the database icon */ - getGlyph: function () { - return "E"; - }, - /** - * Get the name of the CSS class to apply to the glyph. - * This is used to color the glyph to match its - * state (one of ok, caution or err) - * @returns {string} the CSS class to apply to this glyph - */ - getGlyphClass: function () { - return (watches > 2000) ? "caution" : - (watches < 1000) ? "ok" : - undefined; + getCssClass: function () { + return "icon-database"; }, /** * Get the text that should appear in the indicator. diff --git a/example/worker/src/FibonacciIndicator.js b/example/worker/src/FibonacciIndicator.js index d2f25c8aed..777fb3d2f5 100644 --- a/example/worker/src/FibonacciIndicator.js +++ b/example/worker/src/FibonacciIndicator.js @@ -50,15 +50,12 @@ define( requestNext(); return { - getGlyph: function () { - return "?"; + getCssClass: function () { + return "icon-object-unknown"; }, getText: function () { return latest; }, - getGlyphClass: function () { - return ""; - }, getDescription: function () { return ""; } diff --git a/gulpfile.js b/gulpfile.js index fab0f056e0..ff994c6a2c 100644 --- a/gulpfile.js +++ b/gulpfile.js @@ -42,6 +42,7 @@ var gulp = require('gulp'), main: 'main.js', dist: 'dist', assets: 'dist/assets', + reports: 'dist/reports', scss: ['./platform/**/*.scss', './example/**/*.scss'], scripts: [ 'main.js', 'platform/**/*.js', 'src/**/*.js' ], specs: [ 'platform/**/*Spec.js', 'src/**/*Spec.js' ], @@ -112,6 +113,10 @@ gulp.task('lint', function () { .pipe(jshint({ jasmine: true })); return merge(scriptLint, specLint) + .pipe(jshint.reporter('gulp-jshint-html-reporter', { + filename: paths.reports + '/lint/jshint-report.html', + createMissingFolders : true + })) .pipe(jshint.reporter('default')) .pipe(jshint.reporter('fail')); }); diff --git a/index.html b/index.html index e47efe91b5..fcd37cfb0b 100644 --- a/index.html +++ b/index.html @@ -19,16 +19,15 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> - - - - + + + + - - - - - - + + + +
diff --git a/karma.conf.js b/karma.conf.js index 17889dfe43..e682ec6d86 100644 --- a/karma.conf.js +++ b/karma.conf.js @@ -81,7 +81,7 @@ module.exports = function(config) { coverageReporter: { dir: process.env.CIRCLE_ARTIFACTS ? process.env.CIRCLE_ARTIFACTS + '/coverage' : - "dist/coverage", + "dist/reports/coverage", check: { global: { lines: 80 @@ -91,13 +91,13 @@ module.exports = function(config) { // HTML test reporting. htmlReporter: { - outputDir: "target/tests", + outputDir: "dist/reports/tests", preserveDescribeNesting: true, foldAll: false }, junitReporter: { - outputDir: process.env.CIRCLE_TEST_REPORTS || 'target/junit' + outputDir: process.env.CIRCLE_TEST_REPORTS || 'dist/reports/junit' }, // Continuous Integration mode. diff --git a/main.js b/main.js index 268c70060d..6968d8ff26 100644 --- a/main.js +++ b/main.js @@ -27,7 +27,8 @@ requirejs.config({ "angular": "bower_components/angular/angular.min", "angular-route": "bower_components/angular-route/angular-route.min", "csv": "bower_components/comma-separated-values/csv.min", - "es6-promise": "bower_components/es6-promise/promise.min", + "es6-promise": "bower_components/es6-promise/es6-promise.min", + "html2canvas": "bower_components/html2canvas/build/html2canvas.min", "moment": "bower_components/moment/moment", "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format", "saveAs": "bower_components/FileSaver.js/FileSaver.min", @@ -43,6 +44,9 @@ requirejs.config({ "angular-route": { "deps": ["angular"] }, + "html2canvas": { + "exports": "html2canvas" + }, "moment-duration-format": { "deps": ["moment"] }, diff --git a/package.json b/package.json index 3a58a4af19..e47a64e50e 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "openmct", - "version": "0.11.1-SNAPSHOT", + "version": "0.12.0-SNAPSHOT", "description": "The Open MCT core platform", "dependencies": { "express": "^4.13.1", @@ -14,6 +14,7 @@ "gulp": "^3.9.0", "gulp-jscs": "^3.0.2", "gulp-jshint": "^2.0.0", + "gulp-jshint-html-reporter": "^0.1.3", "gulp-rename": "^1.2.2", "gulp-replace-task": "^0.11.0", "gulp-requirejs-optimize": "^0.3.1", @@ -38,7 +39,7 @@ "mkdirp": "^0.5.1", "moment": "^2.11.1", "node-bourbon": "^4.2.3", - "phantomjs-prebuilt": "^2.1.0", + "phantomjs-prebuilt": "2.1.11 || >2.1.12 <3.0.0", "requirejs": "2.1.x", "split": "^1.0.0" }, diff --git a/platform/commonUI/browse/bundle.js b/platform/commonUI/browse/bundle.js index e0a5758fff..5ff13d789e 100644 --- a/platform/commonUI/browse/bundle.js +++ b/platform/commonUI/browse/bundle.js @@ -231,7 +231,7 @@ define([ "$window" ], "group": "windowing", - "glyph": "y", + "cssclass": "icon-new-window", "priority": "preferred" }, { @@ -239,7 +239,6 @@ define([ "implementation": FullscreenAction, "category": "view-control", "group": "windowing", - "glyph": "z", "priority": "default" } ], @@ -247,7 +246,7 @@ define([ { "key": "items", "name": "Items", - "glyph": "9", + "cssclass": "icon-thumbs-strip", "description": "Grid of available items", "template": itemsTemplate, "uses": [ diff --git a/platform/commonUI/browse/res/templates/back-arrow.html b/platform/commonUI/browse/res/templates/back-arrow.html index 4a77e62d0b..44ac390f39 100644 --- a/platform/commonUI/browse/res/templates/back-arrow.html +++ b/platform/commonUI/browse/res/templates/back-arrow.html @@ -20,11 +20,8 @@ at runtime from the About dialog for additional information. --> - - - { diff --git a/platform/commonUI/browse/res/templates/browse.html b/platform/commonUI/browse/res/templates/browse.html index 63197ba84f..aa1415ca81 100644 --- a/platform/commonUI/browse/res/templates/browse.html +++ b/platform/commonUI/browse/res/templates/browse.html @@ -31,7 +31,7 @@
+ class="holder flex-elem create-button-holder"> +
@@ -75,10 +79,6 @@ mct-object="navigatedObject" ng-model="treeModel"> -
diff --git a/platform/commonUI/browse/res/templates/browse/object-header.html b/platform/commonUI/browse/res/templates/browse/object-header.html index 7b80323fab..48a64796da 100644 --- a/platform/commonUI/browse/res/templates/browse/object-header.html +++ b/platform/commonUI/browse/res/templates/browse/object-header.html @@ -19,7 +19,7 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> -{{type.getGlyph()}} + {{parameters.mode}} {{model.name}} diff --git a/platform/commonUI/browse/res/templates/items/grid-item.html b/platform/commonUI/browse/res/templates/items/grid-item.html index 069ecf4a4a..153175eb00 100644 --- a/platform/commonUI/browse/res/templates/items/grid-item.html +++ b/platform/commonUI/browse/res/templates/items/grid-item.html @@ -23,14 +23,14 @@
-
O
+
- {{type.getGlyph()}} + -
}
+
{{model.name}}
diff --git a/platform/commonUI/browse/res/templates/menu-arrow.html b/platform/commonUI/browse/res/templates/menu-arrow.html index e3c1b935e7..83327760b0 100644 --- a/platform/commonUI/browse/res/templates/menu-arrow.html +++ b/platform/commonUI/browse/res/templates/menu-arrow.html @@ -21,6 +21,6 @@ --> - v + \ No newline at end of file diff --git a/platform/commonUI/browse/src/navigation/NavigateAction.js b/platform/commonUI/browse/src/navigation/NavigateAction.js index b3d935812a..6121213a51 100644 --- a/platform/commonUI/browse/src/navigation/NavigateAction.js +++ b/platform/commonUI/browse/src/navigation/NavigateAction.js @@ -48,20 +48,35 @@ define( */ NavigateAction.prototype.perform = function () { var self = this, - navigationAllowed = true; + navigateTo = this.domainObject, + currentObject = self.navigationService.getNavigation(); function allow() { - self.policyService.allow("navigation", self.navigationService.getNavigation(), self.domainObject, function (message) { + var navigationAllowed = true; + self.policyService.allow("navigation", currentObject, navigateTo, function (message) { navigationAllowed = self.$window.confirm(message + "\r\n\r\n" + " Are you sure you want to continue?"); }); return navigationAllowed; } - // Set navigation, and wrap like a promise - return this.$q.when( - allow() && this.navigationService.setNavigation(this.domainObject) - ); + function cancelIfEditing() { + var editing = currentObject.hasCapability('editor') && + currentObject.getCapability('editor').isEditContextRoot(); + + return self.$q.when(editing && currentObject.getCapability("editor").finish()); + } + + function navigate() { + return self.navigationService.setNavigation(navigateTo); + } + + if (allow()) { + return cancelIfEditing().then(navigate); + } else { + return this.$q.when(false); + } + }; /** diff --git a/platform/commonUI/browse/src/windowing/FullscreenAction.js b/platform/commonUI/browse/src/windowing/FullscreenAction.js index 2882f17079..975562af0c 100644 --- a/platform/commonUI/browse/src/windowing/FullscreenAction.js +++ b/platform/commonUI/browse/src/windowing/FullscreenAction.js @@ -46,12 +46,12 @@ define( }; FullscreenAction.prototype.getMetadata = function () { - // We override getMetadata, because the glyph and + // We override getMetadata, because the icon cssclass and // description need to be determined at run-time // based on whether or not we are currently // full screen. var metadata = Object.create(FullscreenAction); - metadata.glyph = screenfull.isFullscreen ? "_" : "z"; + metadata.cssclass = screenfull.isFullscreen ? "icon-fullscreen-expand" : "icon-fullscreen-collapse"; metadata.description = screenfull.isFullscreen ? EXIT_FULLSCREEN : ENTER_FULLSCREEN; metadata.group = "windowing"; diff --git a/platform/commonUI/browse/test/navigation/NavigateActionSpec.js b/platform/commonUI/browse/test/navigation/NavigateActionSpec.js index 003012372b..f9b756eeaa 100644 --- a/platform/commonUI/browse/test/navigation/NavigateActionSpec.js +++ b/platform/commonUI/browse/test/navigation/NavigateActionSpec.js @@ -32,7 +32,9 @@ define( mockQ, mockDomainObject, mockPolicyService, + mockNavigatedObject, mockWindow, + capabilities, action; function mockPromise(value) { @@ -44,6 +46,29 @@ define( } beforeEach(function () { + capabilities = {}; + + mockQ = { when: mockPromise }; + mockNavigatedObject = jasmine.createSpyObj( + "domainObject", + [ + "getId", + "getModel", + "hasCapability", + "getCapability" + ] + ); + + capabilities.editor = jasmine.createSpyObj("editorCapability", [ + "isEditContextRoot", + "finish" + ]); + + mockNavigatedObject.getCapability.andCallFake(function (capability) { + return capabilities[capability]; + }); + mockNavigatedObject.hasCapability.andReturn(false); + mockNavigationService = jasmine.createSpyObj( "navigationService", [ @@ -51,11 +76,14 @@ define( "getNavigation" ] ); - mockNavigationService.getNavigation.andReturn({}); - mockQ = { when: mockPromise }; + mockNavigationService.getNavigation.andReturn(mockNavigatedObject); + mockDomainObject = jasmine.createSpyObj( "domainObject", - ["getId", "getModel", "getCapability"] + [ + "getId", + "getModel" + ] ); mockPolicyService = jasmine.createSpyObj("policyService", @@ -112,6 +140,21 @@ define( }); }); + describe("in edit mode", function () { + beforeEach(function () { + mockNavigatedObject.hasCapability.andCallFake(function (capability) { + return capability === "editor"; + }); + capabilities.editor.isEditContextRoot.andReturn(true); + }); + + it("finishes editing if in edit mode", function () { + action.perform(); + expect(capabilities.editor.finish) + .toHaveBeenCalled(); + }); + }); + it("is only applicable when a domain object is in context", function () { expect(NavigateAction.appliesTo({})).toBeFalsy(); expect(NavigateAction.appliesTo({ diff --git a/platform/commonUI/browse/test/windowing/FullscreenActionSpec.js b/platform/commonUI/browse/test/windowing/FullscreenActionSpec.js index bf2d520b3a..913535fa59 100644 --- a/platform/commonUI/browse/test/windowing/FullscreenActionSpec.js +++ b/platform/commonUI/browse/test/windowing/FullscreenActionSpec.js @@ -51,7 +51,7 @@ define( }); it("provides displayable metadata", function () { - expect(action.getMetadata().glyph).toBeDefined(); + expect(action.getMetadata().cssclass).toBeDefined(); }); }); diff --git a/platform/commonUI/dialog/res/templates/dialog.html b/platform/commonUI/dialog/res/templates/dialog.html index 9df10e0cd0..85a496ce57 100644 --- a/platform/commonUI/dialog/res/templates/dialog.html +++ b/platform/commonUI/dialog/res/templates/dialog.html @@ -21,21 +21,22 @@ -->
{{ngModel.title}}
-
All fields marked * are required.
+
All fields marked are required.
- OK - Cancel diff --git a/platform/commonUI/dialog/res/templates/message.html b/platform/commonUI/dialog/res/templates/message.html index 8568fe5fb1..6a2be98d99 100644 --- a/platform/commonUI/dialog/res/templates/message.html +++ b/platform/commonUI/dialog/res/templates/message.html @@ -16,11 +16,11 @@
{{dialogOption.label}} - {{ngModel.primaryOption.label}} diff --git a/platform/commonUI/dialog/res/templates/overlay-message-list.html b/platform/commonUI/dialog/res/templates/overlay-message-list.html index 5a7a48192f..299d19639c 100644 --- a/platform/commonUI/dialog/res/templates/overlay-message-list.html +++ b/platform/commonUI/dialog/res/templates/overlay-message-list.html @@ -2,7 +2,8 @@
{{ngModel.dialog.title}}
-
Displaying {{ngModel.dialog.messages.length}} messages +
Displaying {{ngModel.dialog.messages.length}} messages
@@ -12,7 +13,7 @@
{{dialogAction.label}} diff --git a/platform/commonUI/dialog/res/templates/overlay-options.html b/platform/commonUI/dialog/res/templates/overlay-options.html index 4d73c59613..89b8be8242 100644 --- a/platform/commonUI/dialog/res/templates/overlay-options.html +++ b/platform/commonUI/dialog/res/templates/overlay-options.html @@ -33,7 +33,7 @@
diff --git a/platform/commonUI/dialog/res/templates/overlay.html b/platform/commonUI/dialog/res/templates/overlay.html index 3908952db9..215fe97aac 100644 --- a/platform/commonUI/dialog/res/templates/overlay.html +++ b/platform/commonUI/dialog/res/templates/overlay.html @@ -19,12 +19,12 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> -
+
x + class="close icon-x">
\ No newline at end of file diff --git a/platform/commonUI/dialog/src/DialogService.js b/platform/commonUI/dialog/src/DialogService.js index ca0a4b09b7..61e3673dd6 100644 --- a/platform/commonUI/dialog/src/DialogService.js +++ b/platform/commonUI/dialog/src/DialogService.js @@ -187,7 +187,7 @@ define( /** * A description of the model options that may be passed to the - * showBlockingMessage method. Note that the DialogModel desribed + * showBlockingMessage method. Note that the DialogModel described * here is shared with the Notifications framework. * @see NotificationService * @@ -200,6 +200,9 @@ define( * 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 {boolean} delay adds a brief delay before loading + * the dialog. Useful for removing the dialog flicker when the + * conditions for displaying the dialog change rapidly. * @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. diff --git a/platform/commonUI/edit/bundle.js b/platform/commonUI/edit/bundle.js index 20d42be719..d2e9a684ae 100644 --- a/platform/commonUI/edit/bundle.js +++ b/platform/commonUI/edit/bundle.js @@ -31,6 +31,7 @@ define([ "./src/actions/PropertiesAction", "./src/actions/RemoveAction", "./src/actions/SaveAction", + "./src/actions/SaveAndStopEditingAction", "./src/actions/SaveAsAction", "./src/actions/CancelAction", "./src/policies/EditActionPolicy", @@ -70,6 +71,7 @@ define([ PropertiesAction, RemoveAction, SaveAction, + SaveAndStopEditingAction, SaveAsAction, CancelAction, EditActionPolicy, @@ -174,7 +176,7 @@ define([ ], "description": "Edit", "category": "view-control", - "glyph": "p" + "cssclass": "major icon-pencil" }, { "key": "properties", @@ -183,7 +185,7 @@ define([ "view-control" ], "implementation": PropertiesAction, - "glyph": "p", + "cssclass": "major icon-pencil", "name": "Edit Properties...", "description": "Edit properties of this object.", "depends": [ @@ -194,7 +196,7 @@ define([ "key": "remove", "category": "contextual", "implementation": RemoveAction, - "glyph": "Z", + "cssclass": "icon-trash", "name": "Remove", "description": "Remove this object from its containing object.", "depends": [ @@ -202,27 +204,38 @@ define([ ] }, { - "key": "save", - "category": "conclude-editing", - "implementation": SaveAction, - "name": "Save", + "key": "save-and-stop-editing", + "category": "save", + "implementation": SaveAndStopEditingAction, + "name": "Save and Finish Editing", + "cssclass": "icon-save labeled", "description": "Save changes made to these objects.", "depends": [ "dialogService" - ], - "priority": "mandatory" + ] }, { "key": "save", - "category": "conclude-editing", + "category": "save", + "implementation": SaveAction, + "name": "Save and Continue Editing", + "cssclass": "icon-save labeled", + "description": "Save changes made to these objects.", + "depends": [ + "dialogService" + ] + }, + { + "key": "save-as", + "category": "save", "implementation": SaveAsAction, - "name": "Save", + "name": "Save As...", + "cssclass": "icon-save labeled", "description": "Save changes made to these objects.", "depends": [ "$injector", "policyService", "dialogService", - "creationService", "copyService" ], "priority": "mandatory" @@ -231,7 +244,10 @@ define([ "key": "cancel", "category": "conclude-editing", "implementation": CancelAction, - "name": "Cancel", + // Because we use the name as label for edit buttons and mct-control buttons need + // the label to be set to undefined in order to not apply the labeled CSS rule. + "name": undefined, + "cssclass": "icon-x no-label", "description": "Discard changes made to these objects.", "depends": [] } @@ -383,7 +399,7 @@ define([ "constants": [ { "key": "editModeBlacklist", - "value": ["copy", "follow", "window", "link", "locate"] + "value": ["copy", "follow", "link", "locate"] }, { "key": "nonEditContextBlacklist", diff --git a/platform/commonUI/edit/res/templates/create/create-button.html b/platform/commonUI/edit/res/templates/create/create-button.html index 77c6198cae..8a1e799783 100644 --- a/platform/commonUI/edit/res/templates/create/create-button.html +++ b/platform/commonUI/edit/res/templates/create/create-button.html @@ -20,7 +20,7 @@ at runtime from the About dialog for additional information. --> -
+
Create
diff --git a/platform/commonUI/edit/res/templates/create/create-menu.html b/platform/commonUI/edit/res/templates/create/create-menu.html index 12abfe7954..64c05e9d38 100644 --- a/platform/commonUI/edit/res/templates/create/create-menu.html +++ b/platform/commonUI/edit/res/templates/create/create-menu.html @@ -22,24 +22,17 @@
-
- {{representation.activeMetadata.glyph}} -
+
{{representation.activeMetadata.name}}
diff --git a/platform/commonUI/edit/res/templates/edit-action-buttons.html b/platform/commonUI/edit/res/templates/edit-action-buttons.html index 56bb1f1d92..2af47b6878 100644 --- a/platform/commonUI/edit/res/templates/edit-action-buttons.html +++ b/platform/commonUI/edit/res/templates/edit-action-buttons.html @@ -20,12 +20,34 @@ at runtime from the About dialog for additional information. --> - - - {{currentAction.getMetadata().name}} - + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform/commonUI/edit/src/actions/CancelAction.js b/platform/commonUI/edit/src/actions/CancelAction.js index 13b005958e..a48ceec996 100644 --- a/platform/commonUI/edit/src/actions/CancelAction.js +++ b/platform/commonUI/edit/src/actions/CancelAction.js @@ -62,7 +62,7 @@ define( } function cancel(allowed) { - return allowed && domainObject.getCapability("editor").cancel(); + return allowed && domainObject.getCapability("editor").finish(); } //Do navigation first in order to trigger unsaved changes dialog diff --git a/platform/commonUI/edit/src/actions/EditAction.js b/platform/commonUI/edit/src/actions/EditAction.js index bd30968289..e65f035edf 100644 --- a/platform/commonUI/edit/src/actions/EditAction.js +++ b/platform/commonUI/edit/src/actions/EditAction.js @@ -69,18 +69,13 @@ define( * Enter edit mode. */ EditAction.prototype.perform = function () { - var self = this; - function cancelEditing() { - self.domainObject.getCapability('editor').cancel(); - self.navigationService.removeListener(cancelEditing); - } + //If this is not the currently navigated object, then navigate // to it. if (this.navigationService.getNavigation() !== this.domainObject) { this.navigationService.setNavigation(this.domainObject); } - this.navigationService.addListener(cancelEditing); this.domainObject.useCapability("editor"); }; diff --git a/platform/commonUI/edit/src/actions/SaveAction.js b/platform/commonUI/edit/src/actions/SaveAction.js index 6f96e84192..8d3ea7f509 100644 --- a/platform/commonUI/edit/src/actions/SaveAction.js +++ b/platform/commonUI/edit/src/actions/SaveAction.js @@ -25,9 +25,8 @@ define( function (SaveInProgressDialog) { /** - * The "Save" action; the action triggered by clicking Save from - * Edit Mode. Exits the editing user interface and invokes object - * capabilities to persist the changes that have been made. + * The "Save" action; it invokes object capabilities to persist + * the changes that have been made. * @constructor * @implements {Action} * @memberof platform/commonUI/edit @@ -41,7 +40,7 @@ define( } /** - * Save changes and conclude editing. + * Save changes. * * @returns {Promise} a promise that will be fulfilled when * cancellation has completed @@ -51,40 +50,22 @@ define( var domainObject = this.domainObject, dialog = new SaveInProgressDialog(this.dialogService); - function resolveWith(object) { - return function () { - return object; - }; - } - // Invoke any save behavior introduced by the editor capability; // this is introduced by EditableDomainObject which is // used to insulate underlying objects from changes made // during editing. function doSave() { - return domainObject.getCapability("editor").save() - .then(resolveWith(domainObject)); + return domainObject.getCapability("editor").save(); } - // Discard the current root view (which will be the editing - // UI, which will have been pushed atop the Browse UI.) - function returnToBrowse(object) { - if (object) { - object.getCapability("action").perform("navigate"); - } - return object; - } - - function hideBlockingDialog(object) { + function hideBlockingDialog() { dialog.hide(); - return object; } dialog.show(); return doSave() .then(hideBlockingDialog) - .then(returnToBrowse) .catch(hideBlockingDialog); }; diff --git a/platform/commonUI/edit/src/actions/SaveAndStopEditingAction.js b/platform/commonUI/edit/src/actions/SaveAndStopEditingAction.js new file mode 100644 index 0000000000..a0a0583048 --- /dev/null +++ b/platform/commonUI/edit/src/actions/SaveAndStopEditingAction.js @@ -0,0 +1,73 @@ +/***************************************************************************** + * Open MCT, Copyright (c) 2014-2016, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +define( + ["./SaveAction"], + function (SaveAction) { + + /** + * The "Save and Stop Editing" action performs a [Save action]{@link SaveAction} + * on the object under edit followed by exiting the edit user interface. + * @constructor + * @implements {Action} + * @memberof platform/commonUI/edit + */ + function SaveAndStopEditingAction( + dialogService, + context + ) { + this.context = context; + this.domainObject = (context || {}).domainObject; + this.dialogService = dialogService; + } + + /** + * Trigger a save operation and exit edit mode. + * + * @returns {Promise} a promise that will be fulfilled when + * cancellation has completed + * @memberof platform/commonUI/edit.SaveAndStopEditingAction# + */ + SaveAndStopEditingAction.prototype.perform = function () { + var domainObject = this.domainObject, + saveAction = new SaveAction(this.dialogService, this.context); + + function closeEditor() { + return domainObject.getCapability("editor").finish(); + } + + return saveAction.perform() + .then(closeEditor) + .catch(closeEditor); + }; + + /** + * Check if this action is applicable in a given context. + * This will ensure that a domain object is present in the context, + * and that this domain object is in Edit mode. + * @returns true if applicable + */ + SaveAndStopEditingAction.appliesTo = SaveAction.appliesTo; + + return SaveAndStopEditingAction; + } +); diff --git a/platform/commonUI/edit/src/actions/SaveAsAction.js b/platform/commonUI/edit/src/actions/SaveAsAction.js index 57a055429a..2befea07fd 100644 --- a/platform/commonUI/edit/src/actions/SaveAsAction.js +++ b/platform/commonUI/edit/src/actions/SaveAsAction.js @@ -42,7 +42,6 @@ define([ $injector, policyService, dialogService, - creationService, copyService, context ) { @@ -52,7 +51,6 @@ define([ }; this.policyService = policyService; this.dialogService = dialogService; - this.creationService = creationService; this.copyService = copyService; } @@ -166,11 +164,16 @@ define([ .then(resolveWith(object)); } - function commitEditingAfterClone(clonedObject) { + function saveAfterClone(clonedObject) { return domainObject.getCapability("editor").save() .then(resolveWith(clonedObject)); } + function finishEditing(clonedObject) { + return domainObject.getCapability("editor").finish() + .then(resolveWith(clonedObject)); + } + function onFailure() { hideBlockingDialog(); return false; @@ -182,7 +185,8 @@ define([ .then(getParent) .then(cloneIntoParent) .then(undirtyOriginals) - .then(commitEditingAfterClone) + .then(saveAfterClone) + .then(finishEditing) .then(hideBlockingDialog) .catch(onFailure); }; diff --git a/platform/commonUI/edit/src/actions/SaveInProgressDialog.js b/platform/commonUI/edit/src/actions/SaveInProgressDialog.js index 56c2c1ad86..78cd371934 100644 --- a/platform/commonUI/edit/src/actions/SaveInProgressDialog.js +++ b/platform/commonUI/edit/src/actions/SaveInProgressDialog.js @@ -9,7 +9,8 @@ define([], function () { title: "Saving...", hint: "Do not navigate away from this page or close this browser tab while this message is displayed.", unknownProgress: true, - severity: "info" + severity: "info", + delay: true }); }; diff --git a/platform/commonUI/edit/src/capabilities/EditorCapability.js b/platform/commonUI/edit/src/capabilities/EditorCapability.js index aa7670d8aa..1cbf239d7d 100644 --- a/platform/commonUI/edit/src/capabilities/EditorCapability.js +++ b/platform/commonUI/edit/src/capabilities/EditorCapability.js @@ -28,8 +28,8 @@ define( * A capability that implements an editing 'session' for a domain * object. An editing session is initiated via a call to .edit(). * Once initiated, any persist operations will be queued pending a - * subsequent call to [.save()](@link #save) or [.cancel()](@link - * #cancel). + * subsequent call to [.save()](@link #save) or [.finish()](@link + * #finish). * @param transactionService * @param domainObject * @constructor @@ -45,7 +45,7 @@ define( /** * Initiate an editing session. This will start a transaction during * which any persist operations will be deferred until either save() - * or cancel() are called. + * or finish() are called. */ EditorCapability.prototype.edit = function () { this.transactionService.startTransaction(); @@ -81,25 +81,25 @@ define( }; /** - * Save any changes from this editing session. This will flush all - * pending persists and end the current transaction + * Save any unsaved changes from this editing session. This will + * end the current transaction and continue with a new one. * @returns {*} */ EditorCapability.prototype.save = function () { - var domainObject = this.domainObject; - return this.transactionService.commit().then(function () { - domainObject.getCapability('status').set('editing', false); + var transactionService = this.transactionService; + return transactionService.commit().then(function () { + transactionService.startTransaction(); }); }; EditorCapability.prototype.invoke = EditorCapability.prototype.edit; /** - * Cancel the current editing session. This will discard any pending + * Finish the current editing session. This will discard any pending * persist operations * @returns {*} */ - EditorCapability.prototype.cancel = function () { + EditorCapability.prototype.finish = function () { var domainObject = this.domainObject; return this.transactionService.cancel().then(function () { domainObject.getCapability("status").set("editing", false); diff --git a/platform/commonUI/edit/src/controllers/EditActionController.js b/platform/commonUI/edit/src/controllers/EditActionController.js index 19fddf931d..ba91b63e9d 100644 --- a/platform/commonUI/edit/src/controllers/EditActionController.js +++ b/platform/commonUI/edit/src/controllers/EditActionController.js @@ -27,7 +27,8 @@ define( [], function () { - var ACTION_CONTEXT = { category: 'conclude-editing' }; + var SAVE_ACTION_CONTEXT = { category: 'save' }; + var OTHERS_ACTION_CONTEXT = { category: 'conclude-editing' }; /** * Controller which supplies action instances for Save/Cancel. @@ -35,12 +36,37 @@ define( * @constructor */ function EditActionController($scope) { - // Maintain all "conclude-editing" actions in the present - // context. + + function actionToMenuOption(action) { + return { + key: action, + name: action.getMetadata().name, + cssclass: action.getMetadata().cssclass + }; + } + + // Maintain all "conclude-editing" and "save" actions in the + // present context. function updateActions() { - $scope.editActions = $scope.action ? - $scope.action.getActions(ACTION_CONTEXT) : + $scope.saveActions = $scope.action ? + $scope.action.getActions(SAVE_ACTION_CONTEXT) : []; + + $scope.saveActionsAsMenuOptions = $scope.saveActions.map(actionToMenuOption); + + $scope.saveActionMenuClickHandler = function (clickedAction) { + clickedAction.perform(); + }; + + $scope.otherEditActions = $scope.action ? + $scope.action.getActions(OTHERS_ACTION_CONTEXT) : + []; + + // Required because Angular does not allow 'bind' + // in expressions. + $scope.actionPerformer = function (action) { + return action.perform.bind(action); + }; } // Update set of actions whenever the action capability diff --git a/platform/commonUI/edit/src/creation/AddAction.js b/platform/commonUI/edit/src/creation/AddAction.js index e57c5f4c7e..6e99ea51a0 100644 --- a/platform/commonUI/edit/src/creation/AddAction.js +++ b/platform/commonUI/edit/src/creation/AddAction.js @@ -51,7 +51,7 @@ define( function AddAction(type, parent, context, $q, dialogService, policyService) { this.metadata = { key: 'add', - glyph: type.getGlyph(), + cssclass: type.getCssClass(), name: type.getName(), type: type.getKey(), description: type.getDescription(), diff --git a/platform/commonUI/edit/src/creation/CreateAction.js b/platform/commonUI/edit/src/creation/CreateAction.js index d7b5e22f01..b83351544f 100644 --- a/platform/commonUI/edit/src/creation/CreateAction.js +++ b/platform/commonUI/edit/src/creation/CreateAction.js @@ -47,7 +47,7 @@ define( function CreateAction(type, parent, context) { this.metadata = { key: 'create', - glyph: type.getGlyph(), + cssclass: type.getCssClass(), name: type.getName(), type: type.getKey(), description: type.getDescription(), @@ -67,12 +67,17 @@ define( editAction, editorCapability; + function closeEditor() { + return editorCapability.finish(); + } + function onSave() { - return editorCapability.save(); + return editorCapability.save() + .then(closeEditor); } function onCancel() { - return editorCapability.cancel(); + return closeEditor(); } newModel.type = this.type.getKey(); @@ -85,9 +90,9 @@ define( if (editAction) { return editAction.perform(); } else if (editorCapability) { - //otherwise, use the save action + //otherwise, use the save as action editorCapability.edit(); - return newObject.getCapability("action").perform("save").then(onSave, onCancel); + return newObject.getCapability("action").perform("save-as").then(onSave, onCancel); } }; diff --git a/platform/commonUI/edit/src/creation/CreateWizard.js b/platform/commonUI/edit/src/creation/CreateWizard.js index 37ef530dbd..6921ca8669 100644 --- a/platform/commonUI/edit/src/creation/CreateWizard.js +++ b/platform/commonUI/edit/src/creation/CreateWizard.js @@ -90,7 +90,9 @@ define( // Ensure there is always a "save in" section if (includeLocation) { sections.push({ - name: 'Location', rows: [{ + name: 'Location', + cssclass: "grows", + rows: [{ name: "Save In", control: "locator", validate: validateLocation, diff --git a/platform/commonUI/edit/src/creation/LocatorController.js b/platform/commonUI/edit/src/creation/LocatorController.js index 54e5659784..53bfc3feb1 100644 --- a/platform/commonUI/edit/src/creation/LocatorController.js +++ b/platform/commonUI/edit/src/creation/LocatorController.js @@ -50,10 +50,7 @@ define( $scope.rootObject = (context && context.getRoot()) || $scope.rootObject; }, 0); - } else if (!contextRoot) { - //If no context root is available, default to the root - // object - $scope.rootObject = undefined; + } else if (!contextRoot && !$scope.rootObject) { // Update the displayed tree on a timeout to avoid // an infinite digest exception. objectService.getObjects(['ROOT']) diff --git a/platform/commonUI/edit/test/actions/CancelActionSpec.js b/platform/commonUI/edit/test/actions/CancelActionSpec.js index 3bd0cee72f..7fdc51b0e9 100644 --- a/platform/commonUI/edit/test/actions/CancelActionSpec.js +++ b/platform/commonUI/edit/test/actions/CancelActionSpec.js @@ -63,7 +63,7 @@ define( capabilities.editor = jasmine.createSpyObj( "editor", - ["save", "cancel", "isEditContextRoot"] + ["save", "finish", "isEditContextRoot"] ); capabilities.action = jasmine.createSpyObj( "actionCapability", @@ -105,7 +105,7 @@ define( return !!capabilities[name]; }); - capabilities.editor.cancel.andReturn(mockPromise(true)); + capabilities.editor.finish.andReturn(mockPromise(true)); action = new CancelAction(actionContext); @@ -130,8 +130,8 @@ define( capabilities.action.perform.andReturn(mockPromise(true)); action.perform(); - // Should have called cancel - expect(capabilities.editor.cancel).toHaveBeenCalled(); + // Should have called finish + expect(capabilities.editor.finish).toHaveBeenCalled(); // Definitely shouldn't call save! expect(capabilities.editor.save).not.toHaveBeenCalled(); diff --git a/platform/commonUI/edit/test/actions/EditActionSpec.js b/platform/commonUI/edit/test/actions/EditActionSpec.js index c896e83dd1..c1a21c83bf 100644 --- a/platform/commonUI/edit/test/actions/EditActionSpec.js +++ b/platform/commonUI/edit/test/actions/EditActionSpec.js @@ -58,7 +58,7 @@ define( ); mockEditor = jasmine.createSpyObj( "editorCapability", - ["edit", "isEditContextRoot", "cancel"] + ["edit", "isEditContextRoot"] ); capabilities = { @@ -98,13 +98,6 @@ define( expect(EditAction.appliesTo(actionContext)).toBe(false); }); - it ("cancels editing when user navigates away", function () { - action.perform(); - expect(mockNavigationService.addListener).toHaveBeenCalled(); - mockNavigationService.addListener.mostRecentCall.args[0](); - expect(mockEditor.cancel).toHaveBeenCalled(); - }); - it ("invokes the Edit capability on the object", function () { action.perform(); expect(mockDomainObject.useCapability).toHaveBeenCalledWith("editor"); diff --git a/platform/commonUI/edit/test/actions/SaveActionSpec.js b/platform/commonUI/edit/test/actions/SaveActionSpec.js index 0243f89a11..7230c09448 100644 --- a/platform/commonUI/edit/test/actions/SaveActionSpec.js +++ b/platform/commonUI/edit/test/actions/SaveActionSpec.js @@ -56,7 +56,7 @@ define( ); mockEditorCapability = jasmine.createSpyObj( "editor", - ["save", "cancel", "isEditContextRoot"] + ["save", "isEditContextRoot"] ); mockActionCapability = jasmine.createSpyObj( "actionCapability", @@ -105,12 +105,6 @@ define( expect(mockEditorCapability.save).toHaveBeenCalled(); }); - it("navigates to the object after saving", - function () { - action.perform(); - expect(mockActionCapability.perform).toHaveBeenCalledWith("navigate"); - }); - describe("a blocking dialog", function () { var mockDialogHandle; diff --git a/platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js b/platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js new file mode 100644 index 0000000000..1fb8fa6492 --- /dev/null +++ b/platform/commonUI/edit/test/actions/SaveAndStopEditingActionSpec.js @@ -0,0 +1,123 @@ +/***************************************************************************** + * Open MCT, Copyright (c) 2014-2016, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +define( + ["../../src/actions/SaveAndStopEditingAction"], + function (SaveAndStopEditingAction) { + + describe("The Save and Stop Editing action", function () { + + // Some mocks appear unused because the + // underlying SaveAction that this action + // depends on is not mocked, so we mock some + // of SaveAction's own dependencies to make + // it run. + var mockDomainObject, + mockEditorCapability, + actionContext, + dialogService, + mockActionCapability, + capabilities = {}, + action; + + function mockPromise(value) { + return { + then: function (callback) { + return mockPromise(callback(value)); + }, + catch: function (callback) { + return mockPromise(callback(value)); + } + }; + } + + beforeEach(function () { + mockDomainObject = jasmine.createSpyObj( + "domainObject", + [ + "getCapability", + "hasCapability", + "getModel", + "getOriginalObject" + ] + ); + mockEditorCapability = jasmine.createSpyObj( + "editor", + ["save", "finish", "isEditContextRoot"] + ); + mockActionCapability = jasmine.createSpyObj( + "actionCapability", + ["perform"] + ); + capabilities.editor = mockEditorCapability; + capabilities.action = mockActionCapability; + + actionContext = { + domainObject: mockDomainObject + }; + dialogService = jasmine.createSpyObj( + "dialogService", + ["showBlockingMessage"] + ); + + mockDomainObject.hasCapability.andReturn(true); + mockDomainObject.getCapability.andCallFake(function (capability) { + return capabilities[capability]; + }); + mockDomainObject.getModel.andReturn({ persisted: 0 }); + mockEditorCapability.save.andReturn(mockPromise(true)); + mockEditorCapability.isEditContextRoot.andReturn(true); + + action = new SaveAndStopEditingAction(dialogService, actionContext); + }); + + + it("only applies to domain object with an editor capability", function () { + expect(SaveAndStopEditingAction.appliesTo(actionContext)).toBe(true); + expect(mockDomainObject.hasCapability).toHaveBeenCalledWith("editor"); + + mockDomainObject.hasCapability.andReturn(false); + mockDomainObject.getCapability.andReturn(undefined); + expect(SaveAndStopEditingAction.appliesTo(actionContext)).toBe(false); + }); + + it("only applies to domain object that has already been persisted", function () { + mockDomainObject.getModel.andReturn({ persisted: undefined }); + expect(SaveAndStopEditingAction.appliesTo(actionContext)).toBe(false); + }); + + it("does not close the editor before completing the save", function () { + mockEditorCapability.save.andReturn(new Promise(function () { + })); + action.perform(); + expect(mockEditorCapability.save).toHaveBeenCalled(); + expect(mockEditorCapability.finish).not.toHaveBeenCalled(); + }); + + it("closes the editor after saving", function () { + action.perform(); + expect(mockEditorCapability.save).toHaveBeenCalled(); + expect(mockEditorCapability.finish).toHaveBeenCalled(); + }); + }); + } +); diff --git a/platform/commonUI/edit/test/actions/SaveAsActionSpec.js b/platform/commonUI/edit/test/actions/SaveAsActionSpec.js index fd8ce18c07..f87cf4766f 100644 --- a/platform/commonUI/edit/test/actions/SaveAsActionSpec.js +++ b/platform/commonUI/edit/test/actions/SaveAsActionSpec.js @@ -19,7 +19,7 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/*global describe,it,expect,beforeEach,jasmine*/ +/*global describe,it,expect,beforeEach,jasmine,runs,waitsFor,spyOn*/ define( ["../../src/actions/SaveAsAction"], @@ -33,7 +33,6 @@ define( mockDialogService, mockCopyService, mockParent, - mockUrlService, actionContext, capabilities = {}, action; @@ -78,10 +77,10 @@ define( mockEditorCapability = jasmine.createSpyObj( "editor", - ["save", "cancel", "isEditContextRoot"] + ["save", "finish", "isEditContextRoot"] ); - mockEditorCapability.cancel.andReturn(mockPromise(undefined)); mockEditorCapability.save.andReturn(mockPromise(true)); + mockEditorCapability.finish.andReturn(mockPromise(true)); mockEditorCapability.isEditContextRoot.andReturn(true); capabilities.editor = mockEditorCapability; @@ -113,16 +112,11 @@ define( ] ); - mockUrlService = jasmine.createSpyObj( - "urlService", - ["urlForLocation"] - ); - actionContext = { domainObject: mockDomainObject }; - action = new SaveAsAction(undefined, undefined, mockDialogService, undefined, mockCopyService, actionContext); + action = new SaveAsAction(undefined, undefined, mockDialogService, mockCopyService, actionContext); spyOn(action, "getObjectService"); action.getObjectService.andReturn(mockObjectService); @@ -156,6 +150,28 @@ define( expect(SaveAsAction.appliesTo(actionContext)).toBe(false); }); + it("uses the editor capability to save the object", function () { + mockEditorCapability.save.andReturn(new Promise(function () {})); + runs(function () { + action.perform(); + }); + waitsFor(function () { + return mockEditorCapability.save.calls.length > 0; + }, "perform() should call EditorCapability.save"); + runs(function () { + expect(mockEditorCapability.finish).not.toHaveBeenCalled(); + }); + }); + + it("uses the editor capability to finish editing the object", function () { + runs(function () { + action.perform(); + }); + waitsFor(function () { + return mockEditorCapability.finish.calls.length > 0; + }, "perform() should call EditorCapability.finish"); + }); + it("returns to browse after save", function () { spyOn(action, "save"); action.save.andReturn(mockPromise(mockDomainObject)); diff --git a/platform/commonUI/edit/test/capabilities/EditorCapabilitySpec.js b/platform/commonUI/edit/test/capabilities/EditorCapabilitySpec.js index 3ffb81921d..77fbd9b74f 100644 --- a/platform/commonUI/edit/test/capabilities/EditorCapabilitySpec.js +++ b/platform/commonUI/edit/test/capabilities/EditorCapabilitySpec.js @@ -134,15 +134,15 @@ define( it("commits the transaction", function () { expect(mockTransactionService.commit).toHaveBeenCalled(); }); - it("resets the edit state", function () { - expect(mockStatusCapability.set).toHaveBeenCalledWith('editing', false); + it("begins a new transaction", function () { + expect(mockTransactionService.startTransaction).toHaveBeenCalled(); }); }); - describe("cancel", function () { + describe("finish", function () { beforeEach(function () { capability.edit(); - capability.cancel(); + capability.finish(); }); it("cancels the transaction", function () { expect(mockTransactionService.cancel).toHaveBeenCalled(); @@ -158,7 +158,7 @@ define( beforeEach(function () { mockDomainObject.getModel.andReturn(model); capability.edit(); - capability.cancel(); + capability.finish(); }); it("returns true if the object has been modified since it" + " was last persisted", function () { diff --git a/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js b/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js index 36faf7beb8..bd5c8a9524 100644 --- a/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js +++ b/platform/commonUI/edit/test/controllers/EditActionControllerSpec.js @@ -19,22 +19,51 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ +/*global describe,it,expect,beforeEach,jasmine*/ define( ["../../src/controllers/EditActionController"], function (EditActionController) { describe("The Edit Action controller", function () { + var mockSaveActionMetadata = { + name: "mocked-save-action", + cssclass: "mocked-save-action-css" + }; + + function fakeGetActions(actionContext) { + if (actionContext.category === "save") { + var mockedSaveActions = [ + jasmine.createSpyObj("mockSaveAction", ["getMetadata", "perform"]), + jasmine.createSpyObj("mockSaveAction", ["getMetadata", "perform"]) + ]; + mockedSaveActions.forEach(function (action) { + action.getMetadata.andReturn(mockSaveActionMetadata); + }); + return mockedSaveActions; + } else if (actionContext.category === "conclude-editing") { + return ["a", "b", "c"]; + } else { + throw "EditActionController uses a context that's not covered by tests."; + } + } + var mockScope, mockActions, controller; beforeEach(function () { mockActions = jasmine.createSpyObj("action", ["getActions"]); + mockActions.getActions.andCallFake(fakeGetActions); mockScope = jasmine.createSpyObj("$scope", ["$watch"]); + mockScope.action = mockActions; controller = new EditActionController(mockScope); }); + function makeControllerUpdateActions() { + mockScope.$watch.mostRecentCall.args[1](); + } + it("watches scope that may change applicable actions", function () { // The action capability expect(mockScope.$watch).toHaveBeenCalledWith( @@ -43,16 +72,34 @@ define( ); }); - it("populates the scope with grouped and ungrouped actions", function () { - mockScope.action = mockActions; + it("populates the scope with 'save' actions", function () { + makeControllerUpdateActions(); + expect(mockScope.saveActions.length).toEqual(2); + }); - mockActions.getActions.andReturn(["a", "b", "c"]); + it("converts 'save' actions to their menu counterparts", function () { + makeControllerUpdateActions(); + var menuOptions = mockScope.saveActionsAsMenuOptions; - // Call the watch - mockScope.$watch.mostRecentCall.args[1](); + expect(menuOptions.length).toEqual(2); + expect(menuOptions[0].key).toEqual(mockScope.saveActions[0]); + expect(menuOptions[1].key).toEqual(mockScope.saveActions[1]); + menuOptions.forEach(function (option) { + expect(option.name).toEqual(mockSaveActionMetadata.name); + expect(option.cssclass).toEqual(mockSaveActionMetadata.cssclass); + }); + }); - // Should have grouped and ungrouped actions in scope now - expect(mockScope.editActions.length).toEqual(3); + it("uses a click handler to perform the clicked action", function () { + makeControllerUpdateActions(); + var sampleSaveAction = mockScope.saveActions[0]; + mockScope.saveActionMenuClickHandler(sampleSaveAction); + expect(sampleSaveAction.perform).toHaveBeenCalled(); + }); + + it("populates the scope with other editing actions", function () { + makeControllerUpdateActions(); + expect(mockScope.otherEditActions).toEqual(["a", "b", "c"]); }); }); } diff --git a/platform/commonUI/edit/test/creation/AddActionProviderSpec.js b/platform/commonUI/edit/test/creation/AddActionProviderSpec.js index 05ee834401..560b2bd0f7 100644 --- a/platform/commonUI/edit/test/creation/AddActionProviderSpec.js +++ b/platform/commonUI/edit/test/creation/AddActionProviderSpec.js @@ -45,6 +45,7 @@ define( [ "getKey", "getGlyph", + "getCssClass", "getName", "getDescription", "getProperties", diff --git a/platform/commonUI/edit/test/creation/CreateActionProviderSpec.js b/platform/commonUI/edit/test/creation/CreateActionProviderSpec.js index a8bf3d2d90..211b735e92 100644 --- a/platform/commonUI/edit/test/creation/CreateActionProviderSpec.js +++ b/platform/commonUI/edit/test/creation/CreateActionProviderSpec.js @@ -41,6 +41,7 @@ define( [ "getKey", "getGlyph", + "getCssClass", "getName", "getDescription", "getProperties", diff --git a/platform/commonUI/edit/test/creation/CreateActionSpec.js b/platform/commonUI/edit/test/creation/CreateActionSpec.js index 23355b10c1..cd3d3fbc91 100644 --- a/platform/commonUI/edit/test/creation/CreateActionSpec.js +++ b/platform/commonUI/edit/test/creation/CreateActionSpec.js @@ -51,6 +51,7 @@ define( [ "getKey", "getGlyph", + "getCssClass", "getName", "getDescription", "getProperties", @@ -102,7 +103,7 @@ define( [ "edit", "save", - "cancel" + "finish" ] ); @@ -119,7 +120,7 @@ define( mockParent.useCapability.andReturn(mockDomainObject); mockType.getKey.andReturn("test"); - mockType.getGlyph.andReturn("T"); + mockType.getCssClass.andReturn("icon-telemetry"); mockType.getDescription.andReturn("a test type"); mockType.getName.andReturn("Test"); mockType.getProperties.andReturn([]); @@ -137,10 +138,11 @@ define( expect(metadata.name).toEqual("Test"); expect(metadata.description).toEqual("a test type"); - expect(metadata.glyph).toEqual("T"); + expect(metadata.cssclass).toEqual("icon-telemetry"); }); describe("the perform function", function () { + var promise = jasmine.createSpyObj("promise", ["then"]); beforeEach(function () { capabilities.action.getActions.andReturn([mockEditAction]); }); @@ -155,19 +157,20 @@ define( expect(mockEditAction.perform).toHaveBeenCalled(); }); - it("uses the save action if object does not have an edit action" + + it("uses the save-as action if object does not have an edit action" + " available", function () { capabilities.action.getActions.andReturn([]); capabilities.action.perform.andReturn(mockPromise(undefined)); + capabilities.editor.save.andReturn(promise); action.perform(); - expect(capabilities.action.perform).toHaveBeenCalledWith("save"); + expect(capabilities.action.perform).toHaveBeenCalledWith("save-as"); }); describe("uses to editor capability", function () { - var promise = jasmine.createSpyObj("promise", ["then"]); beforeEach(function () { capabilities.action.getActions.andReturn([]); capabilities.action.perform.andReturn(promise); + capabilities.editor.save.andReturn(promise); }); it("to save the edit if user saves dialog", function () { @@ -177,10 +180,10 @@ define( expect(capabilities.editor.save).toHaveBeenCalled(); }); - it("to cancel the edit if user cancels dialog", function () { + it("to finish the edit if user cancels dialog", function () { action.perform(); promise.then.mostRecentCall.args[1](); - expect(capabilities.editor.cancel).toHaveBeenCalled(); + expect(capabilities.editor.finish).toHaveBeenCalled(); }); }); }); diff --git a/platform/commonUI/edit/test/creation/CreateWizardSpec.js b/platform/commonUI/edit/test/creation/CreateWizardSpec.js index a36a50d6d9..a2c96db063 100644 --- a/platform/commonUI/edit/test/creation/CreateWizardSpec.js +++ b/platform/commonUI/edit/test/creation/CreateWizardSpec.js @@ -54,6 +54,7 @@ define( [ "getKey", "getGlyph", + "getCssClass", "getName", "getDescription", "getProperties", @@ -74,7 +75,7 @@ define( testModel = { someKey: "some value" }; mockType.getKey.andReturn("test"); - mockType.getGlyph.andReturn("T"); + mockType.getCssClass.andReturn("icon-telemetry"); mockType.getDescription.andReturn("a test type"); mockType.getName.andReturn("Test"); mockType.getInitialModel.andReturn(testModel); diff --git a/platform/commonUI/edit/test/creation/CreationServiceSpec.js b/platform/commonUI/edit/test/creation/CreationServiceSpec.js index 1cc6d55e1b..090437b8c7 100644 --- a/platform/commonUI/edit/test/creation/CreationServiceSpec.js +++ b/platform/commonUI/edit/test/creation/CreationServiceSpec.js @@ -195,7 +195,7 @@ define( expect(failure).toHaveBeenCalled(); }); - it("logs an error when mutaton fails", function () { + it("logs an error when mutation fails", function () { // If mutation of the parent fails, we've lost the // created object - this is an error. var model = { someKey: "some value" }; diff --git a/platform/commonUI/edit/test/creation/LocatorControllerSpec.js b/platform/commonUI/edit/test/creation/LocatorControllerSpec.js index ce18b2d1b8..6837ed2a38 100644 --- a/platform/commonUI/edit/test/creation/LocatorControllerSpec.js +++ b/platform/commonUI/edit/test/creation/LocatorControllerSpec.js @@ -138,23 +138,34 @@ define( }); }); describe("when no context is available", function () { - var defaultRoot = "DEFAULT_ROOT"; - - beforeEach(function () { - mockContext.getRoot.andReturn(undefined); - getObjectsPromise.then.andCallFake(function (callback) { - callback({'ROOT': defaultRoot}); - }); - controller = new LocatorController(mockScope, mockTimeout, mockObjectService); - }); - - it("provides a default context where none is available", function () { - mockScope.$watch.mostRecentCall.args[1](mockDomainObject); - mockTimeout.mostRecentCall.args[0](); - expect(mockScope.rootObject).toBe(defaultRoot); + var defaultRoot = "DEFAULT_ROOT"; + beforeEach(function () { + mockContext.getRoot.andReturn(undefined); + getObjectsPromise.then.andCallFake(function (callback) { + callback({'ROOT': defaultRoot}); }); + controller = new LocatorController(mockScope, mockTimeout, mockObjectService); }); + + it("provides a default context where none is available", function () { + mockScope.$watch.mostRecentCall.args[1](mockDomainObject); + mockTimeout.mostRecentCall.args[0](); + expect(mockScope.rootObject).toBe(defaultRoot); + }); + + it("does not issue redundant requests for the root object", function () { + mockScope.$watch.mostRecentCall.args[1](mockDomainObject); + mockTimeout.mostRecentCall.args[0](); + mockScope.$watch.mostRecentCall.args[1](undefined); + mockTimeout.mostRecentCall.args[0](); + mockScope.$watch.mostRecentCall.args[1](mockDomainObject); + mockTimeout.mostRecentCall.args[0](); + expect(mockObjectService.getObjects.calls.length) + .toEqual(1); + }); + + }); }); } ); diff --git a/platform/commonUI/edit/test/representers/EditRepresenterSpec.js b/platform/commonUI/edit/test/representers/EditRepresenterSpec.js index 14d4ae1c9b..cb766f95a7 100644 --- a/platform/commonUI/edit/test/representers/EditRepresenterSpec.js +++ b/platform/commonUI/edit/test/representers/EditRepresenterSpec.js @@ -105,7 +105,7 @@ define( ); // Finally, check that the provided mutation function - // includes both model and configuratioon + // includes both model and configuration expect( mockDomainObject.useCapability.mostRecentCall.args[1]() ).toEqual({ diff --git a/platform/commonUI/edit/test/representers/EditToolbarRepresenterSpec.js b/platform/commonUI/edit/test/representers/EditToolbarRepresenterSpec.js index 0147601d7d..7cc8314fc6 100644 --- a/platform/commonUI/edit/test/representers/EditToolbarRepresenterSpec.js +++ b/platform/commonUI/edit/test/representers/EditToolbarRepresenterSpec.js @@ -79,7 +79,7 @@ define( it("removes state from parent scope on destroy", function () { // Verify precondition expect(mockScope.$parent.testToolbar).toBeDefined(); - // Destroy the represeter + // Destroy the representer representer.destroy(); // Should have removed toolbar state from view expect(mockScope.$parent.testToolbar).toBeUndefined(); diff --git a/platform/commonUI/general/bundle.js b/platform/commonUI/general/bundle.js index b2eccc1732..15ea3076a6 100644 --- a/platform/commonUI/general/bundle.js +++ b/platform/commonUI/general/bundle.js @@ -259,7 +259,7 @@ define([ "implementation": ClickAwayController, "depends": [ "$document", - "$scope" + "$timeout" ] }, { @@ -381,7 +381,7 @@ define([ { "key": "mctTree", "implementation": MCTTree, - "depends": ['$parse', 'gestureService'] + "depends": ['gestureService'] } ], "constants": [ diff --git a/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-12px.json b/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-12px.json new file mode 100644 index 0000000000..28c510fcee --- /dev/null +++ b/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-12px.json @@ -0,0 +1,207 @@ +{ + "metadata": { + "name": "openmct-symbols-12px", + "lastOpened": 1467322505818, + "created": 1467322503679 + }, + "iconSets": [ + { + "selection": [ + { + "order": 4, + "id": 2, + "prevSize": 12, + "code": 59671, + "name": "icon12-eye-open", + "tempChar": "" + }, + { + "order": 7, + "id": 5, + "prevSize": 12, + "code": 921607, + "name": "icon12-pane-collapse-left", + "tempChar": "" + }, + { + "order": 8, + "id": 4, + "prevSize": 12, + "code": 921608, + "name": "icon12-pane-collapse-right", + "tempChar": "" + }, + { + "order": 6, + "id": 3, + "prevSize": 12, + "code": 921865, + "name": "icon12-folder", + "tempChar": "" + } + ], + "id": 0, + "metadata": { + "name": "openmct-symbols-12px", + "importSize": { + "width": 320, + "height": 384 + }, + "designer": "Charles Hacskaylo" + }, + "height": 1024, + "prevSize": 12, + "icons": [ + { + "id": 2, + "paths": [ + "M512 86c-257.92 0-471.28 185.147-506.667 426 35.493 240.853 248.853 426 506.667 426s471.28-185.147 506.667-426c-35.387-240.853-248.747-426-506.667-426zM738.373 685.2c-131.048 109.517-321.699 109.517-452.747 0-53.328-44.749-90.832-105.477-106.96-173.2 16.101-67.707 53.565-128.435 106.853-173.2 131.048-109.517 321.699-109.517 452.747 0 53.368 44.733 90.909 105.464 107.067 173.2-16.128 67.723-53.632 128.451-106.96 173.2z", + "M682.667 512c0 94.257-76.41 170.667-170.667 170.667s-170.667-76.41-170.667-170.667c0-94.257 76.41-170.667 170.667-170.667s170.667 76.41 170.667 170.667z" + ], + "attrs": [], + "isMulticolor": false, + "grid": 0, + "tags": [ + "icon12-eye-open" + ], + "colorPermutations": { + "1161751": [ + { + "f": 0 + }, + { + "f": 0 + } + ] + } + }, + { + "id": 5, + "paths": [ + "M0 0h170.667v1024h-170.667v-1024z", + "M853.333 256h-256v-256l-341.333 426.667 341.333 426.667v-256h256v-341.333z" + ], + "attrs": [ + { + "opacity": 1 + }, + { + "opacity": 1 + } + ], + "isMulticolor": false, + "width": 853, + "grid": 0, + "tags": [ + "icon12-pane-collapse-left" + ], + "colorPermutations": { + "1161751": [ + {}, + {} + ] + } + }, + { + "id": 4, + "paths": [ + "M682.667 0h170.667v1024h-170.667v-1024z", + "M0 256h256v-256l341.333 426.667-341.333 426.667v-256h-256v-341.333z" + ], + "attrs": [ + { + "opacity": 1 + }, + { + "opacity": 1 + } + ], + "isMulticolor": false, + "width": 853, + "grid": 0, + "tags": [ + "icon12-pane-collapse-right" + ], + "colorPermutations": { + "1161751": [ + {}, + {} + ] + } + }, + { + "id": 3, + "paths": [ + "M938.667 170.667h-341.333l-110.32-110.32c-33.2-33.2-98.667-60.347-145.68-60.347h-256c-47.073 0.136-85.197 38.26-85.333 85.32l-0 341.346c0.136-47.073 38.26-85.197 85.32-85.333l853.346-0c47.073 0.136 85.197 38.26 85.333 85.32l0-170.654c-0.136-47.073-38.26-85.197-85.32-85.333z", + "M85.333 426.667h853.333c47.128 0 85.333 38.205 85.333 85.333v426.667c0 47.128-38.205 85.333-85.333 85.333h-853.333c-47.128 0-85.333-38.205-85.333-85.333v-426.667c0-47.128 38.205-85.333 85.333-85.333z" + ], + "attrs": [], + "isMulticolor": false, + "grid": 0, + "tags": [ + "icon12-folder" + ], + "colorPermutations": { + "1161751": [ + { + "f": 0 + }, + { + "f": 0 + } + ] + } + } + ], + "invisible": false, + "colorThemes": [ + [ + [ + 0, + 0, + 0, + 1 + ], + [ + 0, + 161, + 75, + 1 + ] + ] + ], + "colorThemeIdx": 0 + } + ], + "preferences": { + "showGlyphs": true, + "showCodes": true, + "showQuickUse": true, + "showQuickUse2": true, + "showSVGs": true, + "fontPref": { + "prefix": "icon-", + "metadata": { + "fontFamily": "openmct-symbols-12px", + "majorVersion": 1, + "minorVersion": 0 + }, + "metrics": { + "emSize": 1024, + "baseline": 6.25, + "whitespace": 50 + }, + "embed": false + }, + "imagePref": { + "prefix": "icon-", + "png": true, + "useClassSelector": true, + "color": 0, + "bgColor": 16777215 + }, + "historySize": 100, + "gridSize": 16 + }, + "uid": -1 +} \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json b/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json new file mode 100644 index 0000000000..3351eb3318 --- /dev/null +++ b/platform/commonUI/general/res/fonts/symbols/icomoon-project-openmct-symbols-16px.json @@ -0,0 +1,3002 @@ +{ + "metadata": { + "name": "openmct-symbols-16px", + "lastOpened": 1469724858940, + "created": 1469724856623 + }, + "iconSets": [ + { + "selection": [ + { + "order": 38, + "prevSize": 24, + "name": "icon-alert-rect", + "id": 33, + "code": 59648, + "tempChar": "" + }, + { + "order": 39, + "prevSize": 24, + "name": "icon-alert-triangle", + "id": 34, + "code": 59649, + "tempChar": "" + }, + { + "order": 42, + "prevSize": 24, + "name": "icon-arrow-down", + "id": 37, + "code": 59650, + "tempChar": "" + }, + { + "order": 43, + "prevSize": 24, + "name": "icon-arrow-left", + "id": 38, + "code": 59651, + "tempChar": "" + }, + { + "order": 44, + "prevSize": 24, + "name": "icon-arrow-right", + "id": 39, + "code": 59652, + "tempChar": "" + }, + { + "order": 41, + "prevSize": 24, + "name": "icon-arrow-double-up", + "id": 36, + "code": 59653, + "tempChar": "" + }, + { + "order": 46, + "prevSize": 24, + "name": "icon-arrow-tall-up", + "id": 41, + "code": 59654, + "tempChar": "" + }, + { + "order": 45, + "prevSize": 24, + "name": "icon-arrow-tall-down", + "id": 40, + "code": 59655, + "tempChar": "" + }, + { + "order": 40, + "prevSize": 24, + "name": "icon-arrow-double-down", + "id": 35, + "code": 59656, + "tempChar": "" + }, + { + "order": 47, + "prevSize": 24, + "name": "icon-arrow-up", + "id": 42, + "code": 59657, + "tempChar": "" + }, + { + "order": 51, + "prevSize": 24, + "name": "icon-asterisk", + "id": 46, + "code": 59664, + "tempChar": "" + }, + { + "order": 18, + "prevSize": 24, + "name": "icon-bell", + "id": 13, + "code": 59665, + "tempChar": "" + }, + { + "order": 101, + "prevSize": 24, + "name": "icon-box", + "id": 48, + "code": 59666, + "tempChar": "" + }, + { + "order": 35, + "prevSize": 24, + "name": "icon-box-with-arrow-cursor", + "id": 30, + "code": 59667, + "tempChar": "" + }, + { + "order": 54, + "prevSize": 24, + "name": "icon-check", + "id": 49, + "code": 59668, + "tempChar": "" + }, + { + "order": 56, + "prevSize": 24, + "name": "icon-connectivity", + "id": 51, + "code": 59669, + "tempChar": "" + }, + { + "order": 31, + "prevSize": 24, + "name": "icon-database-in-brackets", + "id": 26, + "code": 59670, + "tempChar": "" + }, + { + "order": 100, + "prevSize": 24, + "name": "icon-eye-open", + "id": 8, + "code": 59671, + "tempChar": "" + }, + { + "order": 65, + "prevSize": 24, + "name": "icon-gear", + "id": 60, + "code": 59672, + "tempChar": "" + }, + { + "order": 19, + "prevSize": 24, + "name": "icon-hourglass", + "id": 14, + "code": 59673, + "tempChar": "" + }, + { + "order": 20, + "prevSize": 24, + "codes": [ + 58888, + 58889, + 58890 + ], + "name": "icon-info", + "id": 15, + "code": 59680, + "tempChar": "" + }, + { + "order": 70, + "prevSize": 24, + "name": "icon-link", + "id": 65, + "code": 59681, + "tempChar": "" + }, + { + "order": 33, + "prevSize": 24, + "name": "icon-lock", + "id": 28, + "code": 59682, + "tempChar": "" + }, + { + "order": 87, + "prevSize": 24, + "name": "icon-minus", + "id": 82, + "code": 59683, + "tempChar": "" + }, + { + "order": 83, + "prevSize": 24, + "name": "icon-people", + "id": 78, + "code": 59684, + "tempChar": "" + }, + { + "order": 29, + "prevSize": 24, + "name": "icon-person", + "id": 24, + "code": 59685, + "tempChar": "" + }, + { + "order": 86, + "prevSize": 24, + "name": "icon-plus", + "id": 81, + "code": 59686, + "tempChar": "" + }, + { + "order": 95, + "prevSize": 24, + "name": "icon-trash", + "id": 90, + "code": 59687, + "tempChar": "" + }, + { + "order": 98, + "prevSize": 24, + "name": "icon-x", + "id": 93, + "code": 59688, + "tempChar": "" + }, + { + "order": 111, + "id": 98, + "name": "icon-brackets", + "prevSize": 24, + "code": 59689, + "tempChar": "" + }, + { + "order": 48, + "prevSize": 24, + "name": "icon-arrows-out", + "id": 43, + "code": 921600, + "tempChar": "" + }, + { + "order": 49, + "prevSize": 24, + "name": "icon-arrows-right-left", + "id": 44, + "code": 921601, + "tempChar": "" + }, + { + "order": 50, + "prevSize": 24, + "name": "icon-arrows-up-down", + "id": 45, + "code": 921602, + "tempChar": "" + }, + { + "order": 9, + "prevSize": 24, + "name": "icon-bullet", + "id": 4, + "code": 921604, + "tempChar": "" + }, + { + "order": 25, + "prevSize": 24, + "name": "icon-calendar", + "id": 20, + "code": 921605, + "tempChar": "" + }, + { + "order": 30, + "prevSize": 24, + "name": "icon-chain-links", + "id": 25, + "code": 921606, + "tempChar": "" + }, + { + "order": 109, + "id": 97, + "prevSize": 24, + "code": 921607, + "name": "icon-pane-collapse-left", + "tempChar": "" + }, + { + "order": 110, + "id": 96, + "prevSize": 24, + "code": 921608, + "name": "icon-pane-collapse-right", + "tempChar": "" + }, + { + "order": 5, + "id": 95, + "prevSize": 24, + "code": 921609, + "name": "icon-download", + "tempChar": "" + }, + { + "order": 60, + "prevSize": 24, + "name": "icon-duplicate", + "id": 55, + "code": 921616, + "tempChar": "" + }, + { + "order": 61, + "prevSize": 24, + "name": "icon-folder-new", + "id": 56, + "code": 921617, + "tempChar": "" + }, + { + "order": 64, + "prevSize": 24, + "name": "icon-fullscreen-expand", + "id": 59, + "code": 921618, + "tempChar": "" + }, + { + "order": 63, + "prevSize": 24, + "name": "icon-fullscreen-collapse", + "id": 58, + "code": 921619, + "tempChar": "" + }, + { + "order": 67, + "prevSize": 24, + "name": "icon-layers", + "id": 62, + "code": 921620, + "tempChar": "" + }, + { + "order": 69, + "prevSize": 24, + "name": "icon-line-horz", + "id": 64, + "code": 921621, + "tempChar": "" + }, + { + "order": 73, + "prevSize": 24, + "name": "icon-magnify", + "id": 68, + "code": 921622, + "tempChar": "" + }, + { + "order": 71, + "prevSize": 24, + "name": "icon-magnify-in", + "id": 66, + "code": 921623, + "tempChar": "" + }, + { + "order": 72, + "prevSize": 24, + "name": "icon-magnify-out", + "id": 67, + "code": 921624, + "tempChar": "" + }, + { + "order": 74, + "prevSize": 24, + "name": "icon-menu", + "id": 69, + "code": 921625, + "tempChar": "" + }, + { + "order": 75, + "prevSize": 24, + "name": "icon-move", + "id": 70, + "code": 921632, + "tempChar": "" + }, + { + "order": 76, + "prevSize": 24, + "name": "icon-new-window", + "id": 71, + "code": 921633, + "tempChar": "" + }, + { + "order": 26, + "prevSize": 24, + "name": "icon-paint-bucket", + "id": 21, + "code": 921634, + "tempChar": "" + }, + { + "order": 81, + "prevSize": 24, + "name": "icon-pause", + "id": 76, + "code": 921635, + "tempChar": "" + }, + { + "order": 82, + "prevSize": 24, + "name": "icon-pencil", + "id": 77, + "code": 921636, + "tempChar": "" + }, + { + "order": 84, + "prevSize": 24, + "name": "icon-play", + "id": 79, + "code": 921637, + "tempChar": "" + }, + { + "order": 85, + "prevSize": 24, + "name": "icon-plot-resource", + "id": 80, + "code": 921638, + "tempChar": "" + }, + { + "order": 27, + "prevSize": 24, + "name": "icon-pointer-left", + "id": 22, + "code": 921639, + "tempChar": "" + }, + { + "order": 28, + "prevSize": 24, + "name": "icon-pointer-right", + "id": 23, + "code": 921640, + "tempChar": "" + }, + { + "order": 32, + "prevSize": 24, + "name": "icon-refresh", + "id": 27, + "code": 921641, + "tempChar": "" + }, + { + "order": 16, + "prevSize": 24, + "name": "icon-save", + "id": 11, + "code": 921648, + "tempChar": "" + }, + { + "order": 88, + "prevSize": 24, + "name": "icon-sine", + "id": 83, + "code": 921649, + "tempChar": "" + }, + { + "order": 102, + "prevSize": 24, + "name": "icon-T", + "id": 84, + "code": 921650, + "tempChar": "" + }, + { + "order": 92, + "prevSize": 24, + "name": "icon-thumbs-strip", + "id": 87, + "code": 921651, + "tempChar": "" + }, + { + "order": 96, + "prevSize": 24, + "name": "icon-two-parts-both", + "id": 91, + "code": 921652, + "tempChar": "" + }, + { + "order": 97, + "prevSize": 24, + "name": "icon-two-parts-one-only", + "id": 92, + "code": 921653, + "tempChar": "" + }, + { + "order": 21, + "prevSize": 24, + "name": "icon-x-in-circle", + "id": 16, + "code": 921654, + "tempChar": "" + }, + { + "order": 37, + "prevSize": 24, + "name": "icon-activity", + "id": 32, + "code": 921856, + "tempChar": "" + }, + { + "order": 36, + "prevSize": 24, + "name": "icon-activity-mode", + "id": 31, + "code": 921857, + "tempChar": "" + }, + { + "order": 52, + "prevSize": 24, + "name": "icon-autoflow-tabular", + "id": 47, + "code": 921858, + "tempChar": "" + }, + { + "order": 55, + "prevSize": 24, + "name": "icon-clock", + "id": 50, + "code": 921859, + "tempChar": "" + }, + { + "order": 58, + "prevSize": 24, + "name": "icon-database", + "id": 53, + "code": 921860, + "tempChar": "" + }, + { + "order": 57, + "prevSize": 24, + "name": "icon-database-query", + "id": 52, + "code": 921861, + "tempChar": "" + }, + { + "order": 17, + "prevSize": 24, + "name": "icon-dataset", + "id": 12, + "code": 921862, + "tempChar": "" + }, + { + "order": 22, + "prevSize": 24, + "name": "icon-datatable", + "id": 17, + "code": 921863, + "tempChar": "" + }, + { + "order": 59, + "prevSize": 24, + "name": "icon-dictionary", + "id": 54, + "code": 921864, + "tempChar": "" + }, + { + "order": 62, + "prevSize": 24, + "name": "icon-folder", + "id": 57, + "code": 921865, + "tempChar": "" + }, + { + "order": 66, + "prevSize": 24, + "name": "icon-image", + "id": 61, + "code": 921872, + "tempChar": "" + }, + { + "order": 68, + "prevSize": 24, + "name": "icon-layout", + "id": 63, + "code": 921873, + "tempChar": "" + }, + { + "order": 77, + "prevSize": 24, + "name": "icon-object", + "id": 72, + "code": 921874, + "tempChar": "" + }, + { + "order": 78, + "prevSize": 24, + "name": "icon-object-unknown", + "id": 73, + "code": 921875, + "tempChar": "" + }, + { + "order": 79, + "prevSize": 24, + "name": "icon-packet", + "id": 74, + "code": 921876, + "tempChar": "" + }, + { + "order": 80, + "prevSize": 24, + "name": "icon-page", + "id": 75, + "code": 921877, + "tempChar": "" + }, + { + "order": 114, + "id": 99, + "name": "icon-plot-overlay", + "prevSize": 24, + "code": 921878, + "tempChar": "" + }, + { + "order": 113, + "id": 100, + "name": "icon-plot-stacked", + "prevSize": 24, + "code": 921879, + "tempChar": "" + }, + { + "order": 10, + "prevSize": 24, + "name": "icon-session", + "id": 5, + "code": 921880, + "tempChar": "" + }, + { + "order": 24, + "prevSize": 24, + "name": "icon-tabular", + "id": 19, + "code": 921881, + "tempChar": "" + }, + { + "order": 7, + "prevSize": 24, + "name": "icon-tabular-lad", + "id": 2, + "code": 921888, + "tempChar": "" + }, + { + "order": 6, + "prevSize": 24, + "name": "icon-tabular-lad-set", + "id": 1, + "code": 921889, + "tempChar": "" + }, + { + "order": 8, + "prevSize": 24, + "name": "icon-tabular-realtime", + "id": 3, + "code": 921890, + "tempChar": "" + }, + { + "order": 23, + "prevSize": 24, + "name": "icon-tabular-scrolling", + "id": 18, + "code": 921891, + "tempChar": "" + }, + { + "order": 112, + "prevSize": 24, + "name": "icon-telemetry", + "id": 86, + "code": 921892, + "tempChar": "" + }, + { + "order": 90, + "prevSize": 24, + "name": "icon-telemetry-panel", + "id": 85, + "code": 921893, + "tempChar": "" + }, + { + "order": 93, + "prevSize": 24, + "name": "icon-timeline", + "id": 88, + "code": 921894, + "tempChar": "" + }, + { + "order": 116, + "id": 101, + "name": "icon-timer-v1.5", + "prevSize": 24, + "code": 921895, + "tempChar": "" + }, + { + "order": 11, + "prevSize": 24, + "name": "icon-topic", + "id": 6, + "code": 921896, + "tempChar": "" + }, + { + "order": 115, + "prevSize": 24, + "name": "icon-box-with-dashed-lines", + "id": 29, + "code": 921897, + "tempChar": "" + } + ], + "metadata": { + "name": "openmct-symbols-16px", + "importSize": { + "width": 448, + "height": 512 + }, + "designer": "Charles Hacskaylo", + "iconsHash": 1484196519 + }, + "height": 1024, + "prevSize": 24, + "icons": [ + { + "paths": [ + "M896 0h-768c-70.6 0.2-127.8 57.4-128 128v768c0.2 70.6 57.4 127.8 128 128h768c70.6-0.2 127.8-57.4 128-128v-768c-0.2-70.6-57.4-127.8-128-128zM576 896h-128v-128h128v128zM597.8 512l-37.8 192h-96l-37.8-192v-384h171.8v384z" + ], + "grid": 16, + "tags": [ + "icon-alert-rect" + ], + "defaultCode": 33, + "id": 33, + "attrs": [ + { + "fill": "rgb(207, 45, 75)" + } + ], + "isMulticolor": false, + "colorPermutations": { + "1161751207457516161751": [ + { + "f": 3 + } + ] + } + }, + { + "paths": [ + "M998.2 848.8l-422.6-739.6c-35-61.2-92-61.2-127 0l-422.8 739.6c-35 61.2-6 111.2 64.4 111.2h843.4c70.6 0 99.6-50 64.6-111.2zM576 896h-128v-128h128v128zM597.8 512l-37.8 192h-96l-37.8-192v-256h171.8v256z" + ], + "grid": 16, + "tags": [ + "icon-alert-triangle" + ], + "defaultCode": 58883, + "id": 34, + "attrs": [ + { + "fill": "rgb(207, 45, 75)" + } + ], + "isMulticolor": false, + "colorPermutations": { + "1161751207457516161751": [ + { + "f": 3 + } + ] + } + }, + { + "paths": [ + "M512 768l512-512h-1024z" + ], + "grid": 16, + "tags": [ + "icon-arrow-down" + ], + "defaultCode": 118, + "id": 37, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M256 512l512 512v-1024z" + ], + "grid": 16, + "tags": [ + "icon-arrow-left" + ], + "defaultCode": 60, + "id": 38, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M768 512l-512-512v1024z" + ], + "grid": 16, + "tags": [ + "icon-arrow-right" + ], + "defaultCode": 62, + "id": 39, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M510 510l512 512h-1024z", + "M510-2l512 512h-1024z" + ], + "grid": 16, + "tags": [ + "icon-arrow-double-up" + ], + "defaultCode": 235, + "id": 36, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M512 0l512 1024h-1024z" + ], + "grid": 16, + "tags": [ + "icon-arrow-tall-up" + ], + "defaultCode": 237, + "id": 41, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M512 1024l-512-1024h1024z" + ], + "grid": 16, + "tags": [ + "icon-arrow-tall-down" + ], + "defaultCode": 236, + "id": 40, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M510 510l-512-512h1024z", + "M510 1022l-512-512h1024z" + ], + "grid": 16, + "tags": [ + "icon-arrow-double-down" + ], + "defaultCode": 238, + "id": 35, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M512 256l-512 512h1024z" + ], + "grid": 16, + "tags": [ + "icon-arrow-up" + ], + "defaultCode": 94, + "id": 42, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M1004.166 340.458l-97.522-168.916-330.534 229.414 33.414-400.956h-195.048l33.414 400.956-330.534-229.414-97.522 168.916 363.944 171.542-363.944 171.542 97.522 168.916 330.534-229.414-33.414 400.956h195.048l-33.414-400.956 330.534 229.414 97.522-168.916-363.944-171.542z" + ], + "grid": 16, + "tags": [ + "icon-asterisk" + ], + "defaultCode": 42, + "id": 46, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M512 1024c106 0 192-86 192-192h-384c0 106 86 192 192 192z", + "M896 448v-64c0-212-172-384-384-384s-384 172-384 384v64c0 70.6-57.4 128-128 128v128h1024v-128c-70.6 0-128-57.4-128-128z" + ], + "attrs": [ + { + "fill": "rgb(6, 161, 75)" + }, + { + "fill": "rgb(6, 161, 75)" + } + ], + "grid": 16, + "tags": [ + "icon-bell" + ], + "colorPermutations": { + "16161751": [ + { + "f": 1 + }, + { + "f": 1 + } + ], + "125525525516161751": [ + { + "f": 1 + }, + { + "f": 1 + } + ], + "1161751207457516161751": [ + { + "f": 2 + }, + { + "f": 2 + } + ] + }, + "defaultCode": 58896, + "id": 13 + }, + { + "paths": [ + "M0 0h1024v1024h-1024v-1024z" + ], + "attrs": [ + { + "fill": "rgb(0, 0, 0)" + } + ], + "grid": 16, + "tags": [ + "icon-box-round-corners" + ], + "colorPermutations": { + "16161751": [ + { + "f": 0 + } + ], + "125525525516161751": [ + { + "f": 0 + } + ], + "1161751207457516161751": [ + { + "f": 0 + } + ] + }, + "defaultCode": 224, + "id": 48 + }, + { + "paths": [ + "M894-2h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h400c-2.2-3.8-4-7.6-5.8-11.4l-255.2-576.8c-21.4-48.4-10.8-105 26.6-142.4 24.4-24.4 57.2-37.4 90.4-37.4 17.4 0 35.2 3.6 51.8 11l576.6 255.4c4 1.8 7.8 3.8 11.4 5.8v-400.2c0.2-70.4-57.4-128-127.8-128z", + "M958.6 637.4l-576.6-255.4 255.4 576.6 64.6-128.6 192 192 128-128-192-192z" + ], + "attrs": [ + { + "fill": "rgb(0, 0, 0)" + }, + { + "fill": "rgb(0, 0, 0)" + } + ], + "grid": 16, + "tags": [ + "icon-box-with-arrow-cursor" + ], + "colorPermutations": { + "16161751": [ + { + "f": 0 + }, + { + "f": 0 + } + ], + "125525525516161751": [ + { + "f": 0 + }, + { + "f": 0 + } + ], + "1161751207457516161751": [ + { + "f": 0 + }, + { + "f": 0 + } + ] + }, + "defaultCode": 58880, + "id": 30 + }, + { + "paths": [ + "M1024 0l-640 640-384-384v384l384 384 640-640z" + ], + "grid": 16, + "tags": [ + "icon-check" + ], + "defaultCode": 50, + "id": 49, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M704 576c0 70.4-57.6 128-128 128h-128c-70.4 0-128-57.6-128-128v-128c0-70.4 57.6-128 128-128h128c70.4 0 128 57.6 128 128v128z", + "M1024 512l-192-320v640z", + "M0 512l192-320v640z" + ], + "grid": 16, + "tags": [ + "icon-connectivity" + ], + "defaultCode": 46, + "id": 51, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M768 352c0 53.019-114.615 96-256 96s-256-42.981-256-96c0-53.019 114.615-96 256-96s256 42.981 256 96z", + "M768 672v-256c0 53-114.6 96-256 96s-256-43-256-96v256c0 53 114.6 96 256 96s256-43 256-96z", + "M832 0h-128v192h127.6c0.2 0 0.2 0.2 0.4 0.4v639.4c0 0.2-0.2 0.2-0.4 0.4h-127.6v192h128c105.6 0 192-86.4 192-192v-640.2c0-105.6-86.4-192-192-192z", + "M192 831.6v-639.4c0-0.2 0.2-0.2 0.4-0.4h127.6v-191.8h-128c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h128v-192h-127.6c-0.2 0-0.4-0.2-0.4-0.4z" + ], + "grid": 16, + "tags": [ + "icon-database-in-brackets" + ], + "defaultCode": 115, + "id": 26, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M512 116.4c-245.8 0-452.2 168-510.8 395.6 58.6 227.4 265 395.6 510.8 395.6s452.2-168 510.8-395.6c-58.6-227.4-265-395.6-510.8-395.6zM829.2 588.4c-22.6 34.4-50.6 64.8-83 90.4-32.8 25.8-69 45.6-108 59.4-40.4 14.2-82.8 21.4-126 21.4s-85.8-7.2-126-21.4c-39-13.8-75.4-33.8-108-59.4-32.4-25.6-60.4-55.8-83-90.4-15.8-24-28.8-49.6-38.6-76.4 10-26.8 23-52.4 38.6-76.4 22.6-34.4 50.6-64.8 83-90.4 32.8-25.8 69-45.6 108-59.4 40.4-14.2 82.8-21.4 126-21.4s85.8 7.2 126 21.4c39 13.8 75.4 33.8 108 59.4 32.4 25.6 60.4 55.8 83 90.4 15.8 24 28.8 49.6 38.6 76.4-9.8 26.8-22.8 52.4-38.6 76.4z", + "M704 512c0 106.039-85.961 192-192 192s-192-85.961-192-192c0-106.039 85.961-192 192-192s192 85.961 192 192z" + ], + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + } + ], + "grid": 16, + "tags": [ + "icon-crosshair" + ], + "defaultCode": 58901, + "id": 8, + "isMulticolor": false, + "colorPermutations": { + "1161751207457516161751": [ + { + "f": 1 + }, + { + "f": 1 + } + ] + } + }, + { + "paths": [ + "M1024 576v-128l-140.976-35.244c-8.784-32.922-21.818-64.106-38.504-92.918l74.774-124.622-90.51-90.51-124.622 74.774c-28.812-16.686-59.996-29.72-92.918-38.504l-35.244-140.976h-128l-35.244 140.976c-32.922 8.784-64.106 21.818-92.918 38.504l-124.622-74.774-90.51 90.51 74.774 124.622c-16.686 28.812-29.72 59.996-38.504 92.918l-140.976 35.244v128l140.976 35.244c8.784 32.922 21.818 64.106 38.504 92.918l-74.774 124.622 90.51 90.51 124.622-74.774c28.812 16.686 59.996 29.72 92.918 38.504l35.244 140.976h128l35.244-140.976c32.922-8.784 64.106-21.818 92.918-38.504l124.622 74.774 90.51-90.51-74.774-124.622c16.686-28.812 29.72-59.996 38.504-92.918l140.976-35.244zM704 512c0 106.038-85.962 192-192 192s-192-85.962-192-192 85.962-192 192-192 192 85.962 192 192z" + ], + "grid": 16, + "tags": [ + "icon-gear" + ], + "defaultCode": 71, + "id": 60, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M1024 0h-1024c0 282.8 229.2 512 512 512s512-229.2 512-512zM512 384c-102.6 0-199-40-271.6-112.4-41.2-41.2-72-90.2-90.8-143.6h724.6c-18.8 53.4-49.6 102.4-90.8 143.6-72.4 72.4-168.8 112.4-271.4 112.4z", + "M512 512c-282.8 0-512 229.2-512 512h1024c0-282.8-229.2-512-512-512z" + ], + "attrs": [ + { + "fill": "rgb(6, 161, 75)" + }, + { + "fill": "rgb(6, 161, 75)" + } + ], + "grid": 16, + "tags": [ + "icon-hourglass" + ], + "colorPermutations": { + "16161751": [ + { + "f": 1 + }, + { + "f": 1 + } + ], + "125525525516161751": [ + { + "f": 1 + }, + { + "f": 1 + } + ], + "1161751207457516161751": [ + { + "f": 2 + }, + { + "f": 2 + } + ] + }, + "defaultCode": 58889, + "id": 14 + }, + { + "paths": [ + "M512 0c-282.8 0-512 229.2-512 512s229.2 512 512 512 512-229.2 512-512-229.2-512-512-512zM512 128c70.6 0 128 57.4 128 128s-57.4 128-128 128c-70.6 0-128-57.4-128-128s57.4-128 128-128zM704 832h-384v-128h64v-256h256v256h64v128z" + ], + "attrs": [ + { + "fill": "rgb(0, 0, 0)" + } + ], + "grid": 16, + "tags": [ + "icon-info-v1.5" + ], + "colorPermutations": { + "16161751": [ + { + "f": 0 + } + ], + "125525525516161751": [ + { + "f": 0 + } + ], + "1161751207457516161751": [ + { + "f": 0 + } + ] + }, + "defaultCode": 58888, + "id": 15 + }, + { + "paths": [ + "M1024 512l-512-512v307.2l-512 204.8v256h512v256z" + ], + "grid": 16, + "tags": [ + "icon-link" + ], + "defaultCode": 244, + "id": 65, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M832 384h-32v-96c0-158.8-129.2-288-288-288s-288 129.2-288 288v96h-32c-70.4 0-128 57.6-128 128v384c0 70.4 57.6 128 128 128h640c70.4 0 128-57.6 128-128v-384c0-70.4-57.6-128-128-128zM416 288c0-53 43-96 96-96s96 43 96 96v96h-192v-96z" + ], + "grid": 16, + "tags": [ + "icon-lock" + ], + "defaultCode": 108, + "id": 28, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M960 640c35.2 0 64-28.8 64-64v-128c0-35.2-28.8-64-64-64h-896c-35.2 0-64 28.8-64 64v128c0 35.2 28.8 64 64 64h896z" + ], + "grid": 16, + "tags": [ + "icon-minus" + ], + "defaultCode": 45, + "id": 82, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M704 320h64c70.4 0 128-57.6 128-128v-64c0-70.4-57.6-128-128-128h-64c-70.4 0-128 57.6-128 128v64c0 70.4 57.6 128 128 128z", + "M256 320h64c70.4 0 128-57.6 128-128v-64c0-70.4-57.6-128-128-128h-64c-70.4 0-128 57.6-128 128v64c0 70.4 57.6 128 128 128z", + "M832 384h-192c-34.908 0-67.716 9.448-96 25.904 57.278 33.324 96 95.404 96 166.096v448h384v-448c0-105.6-86.4-192-192-192z", + "M384 384h-192c-105.6 0-192 86.4-192 192v448h576v-448c0-105.6-86.4-192-192-192z" + ], + "grid": 16, + "tags": [ + "icon-people" + ], + "defaultCode": 79, + "id": 78, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M768 256c0 105.6-86.4 192-192 192h-128c-105.6 0-192-86.4-192-192v-64c0-105.6 86.4-192 192-192h128c105.6 0 192 86.4 192 192v64z", + "M64 1024v-192c0-140.8 115.2-256 256-256h384c140.8 0 256 115.2 256 256v192z" + ], + "grid": 16, + "tags": [ + "icon-person" + ], + "defaultCode": 80, + "id": 24, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M960 384h-330v-320c0-35.2-28.8-64-64-64h-108c-35.2 0-64 28.8-64 64v320h-330c-35.2 0-64 28.8-64 64v128c0 35.2 28.8 64 64 64h330v320c0 35.2 28.8 64 64 64h108c35.2 0 64-28.8 64-64v-320h330c35.2 0 64-28.8 64-64v-128c0-35.2-28.8-64-64-64z" + ], + "grid": 16, + "tags": [ + "icon-plus" + ], + "defaultCode": 43, + "id": 81, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M832 128h-192.36v-64c0-35.2-28.8-64-64-64h-128c-35.2 0-64 28.8-64 64v64h-191.64c-105.6 0-192 72-192 160s0 160 0 160h64v384c0 105.6 86.4 192 192 192h512c105.6 0 192-86.4 192-192v-384h64c0 0 0-72 0-160s-86.4-160-192-160zM320 832h-128v-384h128v384zM576 832h-128v-384h128v384zM832 832h-128v-384h128v384z" + ], + "grid": 16, + "tags": [ + "icon-trash" + ], + "defaultCode": 90, + "id": 90, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M384 512l-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" + ], + "grid": 16, + "tags": [ + "icon-x-heavy" + ], + "defaultCode": 120, + "id": 93, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "id": 98, + "paths": [ + "M832 0h-192v192h191.66l0.34 0.34v639.32l-0.34 0.34h-191.66v192h192c105.6 0 192-86.4 192-192v-640c0-105.6-86.4-192-192-192z", + "M384 832h-191.66l-0.34-0.34v-639.32l0.34-0.34h191.66v-192h-192c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h192v-192z" + ], + "attrs": [ + {}, + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 16, + "tags": [ + "icon-brackets" + ], + "colorPermutations": { + "1161751207457516161751": [ + {}, + {} + ] + } + }, + { + "paths": [ + "M0 512l256 256v-512z", + "M512 0l-256 256h512z", + "M512 1024l256-256h-512z", + "M768 256v512l256-256z" + ], + "grid": 16, + "tags": [ + "icon-arrows-out" + ], + "defaultCode": 73, + "id": 43, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M1024 512l-448 512v-1024z", + "M448 0l-448 512 448 512z" + ], + "grid": 16, + "tags": [ + "icon-arrows-right-left" + ], + "defaultCode": 58893, + "id": 44, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M512 0l512 448h-1024z", + "M0 576l512 448 512-448z" + ], + "grid": 16, + "tags": [ + "icon-arrows-up-down" + ], + "defaultCode": 53, + "id": 45, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M832 752c0 44-36 80-80 80h-480c-44 0-80-36-80-80v-480c0-44 36-80 80-80h480c44 0 80 36 80 80v480z" + ], + "grid": 16, + "tags": [ + "icon-bullet" + ], + "defaultCode": 58905, + "id": 4, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM640 448h-256v-192h256v192zM384 512h256v192h-256v-192zM320 704h-256v-192h256v192zM320 256v192h-256v-192h256zM128 960c-17 0-33-6.6-45.2-18.8s-18.8-28.2-18.8-45.2v-128h256v192h-192zM384 960v-192h256v192h-256zM960 896c0 17-6.6 33-18.8 45.2s-28.2 18.8-45.2 18.8h-192v-192h256v128zM960 704h-256v-192h256v192zM960 448h-256v-192h256v192z" + ], + "attrs": [ + { + "fill": "rgb(6,161,75)", + "opacity": 1 + } + ], + "grid": 16, + "tags": [ + "icon-calendar" + ], + "colorPermutations": { + "16161751": [ + { + "f": 1 + } + ], + "125525525516161751": [ + { + "f": 1 + } + ], + "1161751207457516161751": [ + { + "f": 2 + } + ] + }, + "defaultCode": 58885, + "id": 20 + }, + { + "paths": [ + "M958.4 65.6c-43.8-43.8-101-65.6-158.4-65.6s-114.6 21.8-158.4 65.6l-128 128c-74 74-85.4 187-34 273l-12.8 12.8c-35.4-20.8-75-31.4-114.8-31.4-57.4 0-114.6 21.8-158.4 65.6l-128 128c-87.4 87.4-87.4 229.4 0 316.8 43.8 43.8 101 65.6 158.4 65.6s114.6-21.8 158.4-65.6l128-128c74-74 85.4-187 34-273l12.8-12.8c35.2 21 75 31.6 114.6 31.6 57.4 0 114.6-21.8 158.4-65.6l128-128c87.6-87.6 87.6-229.6 0.2-317zM419.8 739.8l-128 128c-18 18.2-42.2 28.2-67.8 28.2s-49.8-10-67.8-28.2c-37.4-37.4-37.4-98.4 0-135.8l128-128c18.2-18.2 42.2-28.2 67.8-28.2 5.6 0 11.2 0.6 16.8 1.4l-55.6 55.6c-10.4 10.4-16.2 24.2-16.2 38.8s5.8 28.6 16.2 38.8c10.4 10.4 24.2 16.2 38.8 16.2s28.6-5.8 38.8-16.2l55.6-55.6c5.4 30.4-3.6 62.2-26.6 85zM867.8 291.8l-128 128c-18 18.2-42.2 28.2-67.8 28.2-5.6 0-11.2-0.6-16.8-1.4l55.6-55.6c10.4-10.4 16.2-24.2 16.2-38.8s-5.8-28.6-16.2-38.8c-10.4-10.4-24.2-16.2-38.8-16.2s-28.6 5.8-38.8 16.2l-55.6 55.6c-5.2-29.8 3.6-61.6 26.6-84.6l128-128c18-18.4 42.2-28.4 67.8-28.4s49.8 10 67.8 28.2c37.6 37.4 37.6 98.2 0 135.6z" + ], + "grid": 16, + "tags": [ + "icon-chain-links" + ], + "defaultCode": 232, + "id": 25, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "id": 97, + "paths": [ + "M0 0h192v1024h-192v-1024z", + "M832 256h-256v-256l-320 416 320 416v-256h256v-320z" + ], + "attrs": [ + { + "opacity": 1 + }, + { + "opacity": 1 + } + ], + "isMulticolor": false, + "width": 832, + "grid": 16, + "tags": [ + "icon-pane-collapse-left" + ], + "colorPermutations": { + "1161751207457516161751": [ + {}, + {} + ] + } + }, + { + "id": 96, + "paths": [ + "M640 0h192v1024h-192v-1024z", + "M0 256h256v-256l320 416-320 416v-256h-256v-320z" + ], + "attrs": [ + { + "opacity": 1 + }, + { + "opacity": 1 + } + ], + "isMulticolor": false, + "width": 832, + "grid": 16, + "tags": [ + "icon-pane-collapse-right" + ], + "colorPermutations": { + "1161751207457516161751": [ + {}, + {} + ] + } + }, + { + "id": 95, + "paths": [ + "M832 576v255.66l-0.34 0.34-639.66-0.34v-255.66h-192v256c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-256h-192z", + "M512 640l448-448h-256v-192h-384v192h-256l448 448z" + ], + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + } + ], + "isMulticolor": false, + "grid": 16, + "tags": [ + "icon-download" + ], + "colorPermutations": { + "1161751207457516161751": [ + { + "f": 1 + }, + { + "f": 1 + } + ] + } + }, + { + "paths": [ + "M640 256v-128c0-70.4-57.6-128-128-128h-384c-70.4 0-128 57.6-128 128v384c0 70.4 57.6 128 128 128h128v-139.6c0-134.8 109.6-244.4 244.4-244.4h139.6z", + "M896 384h-384c-70.4 0-128 57.6-128 128v384c0 70.4 57.6 128 128 128h384c70.4 0 128-57.6 128-128v-384c0-70.4-57.6-128-128-128z" + ], + "grid": 16, + "tags": [ + "icon-duplicate" + ], + "defaultCode": 242, + "id": 55, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M896 192h-320c-16.4-16.4-96.8-96.8-109.2-109.2l-37.4-37.4c-25-25-74.2-45.4-109.4-45.4h-256c-35.2 0-64 28.8-64 64v384c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v-128c0-70.4-57.6-128-128-128z", + "M896 448h-768c-70.4 0-128 57.6-128 128v320c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-320c0-70.4-57.6-128-128-128zM704 800h-128v128h-128v-128h-128v-128h128v-128h128v128h128v128z" + ], + "grid": 16, + "tags": [ + "icon-folder-new" + ], + "defaultCode": 102, + "id": 56, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M192.344 832c-0.118-0.1-0.244-0.224-0.344-0.344v-191.656h-192v192c0 105.6 86.4 192 192 192h192v-192h-191.656z", + "M192 192.344c0.1-0.118 0.224-0.244 0.344-0.344h191.656v-192h-192c-105.6 0-192 86.4-192 192v192h192v-191.656z", + "M832 0h-192v192h191.656c0.118 0.1 0.244 0.226 0.344 0.344v191.656h192v-192c0-105.6-86.4-192-192-192z", + "M832 831.656c-0.1 0.118-0.224 0.244-0.344 0.344h-191.656v192h192c105.6 0 192-86.4 192-192v-192h-192v191.656z" + ], + "grid": 16, + "tags": [ + "icon-fullscreen-expand" + ], + "defaultCode": 122, + "id": 59, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M191.656 832c0.118 0.1 0.244 0.224 0.344 0.344v191.656h192v-192c0-105.6-86.4-192-192-192h-192v192h191.656z", + "M192 191.656c-0.1 0.118-0.224 0.244-0.344 0.344h-191.656v192h192c105.6 0 192-86.4 192-192v-192h-192v191.656z", + "M832 384h192v-192h-191.656c-0.118-0.1-0.244-0.226-0.344-0.344v-191.656h-192v192c0 105.6 86.4 192 192 192z", + "M832 832.344c0.1-0.118 0.224-0.244 0.344-0.344h191.656v-192h-192c-105.6 0-192 86.4-192 192v192h192v-191.656z" + ], + "grid": 16, + "tags": [ + "icon-fullscreen-collapse" + ], + "defaultCode": 95, + "id": 58, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M1024 384l-512-384-512 384 512 384z", + "M512 896l-426.666-320-85.334 64 512 384 512-384-85.334-64z" + ], + "grid": 16, + "tags": [ + "icon-layers" + ], + "defaultCode": 225, + "id": 62, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M64 576c-35.346 0-64-28.654-64-64s28.654-64 64-64h896c35.346 0 64 28.654 64 64s-28.654 64-64 64h-896z" + ], + "grid": 16, + "tags": [ + "icon-line-horz" + ], + "defaultCode": 226, + "id": 64, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M1024 896l-201.662-201.662c47.922-72.498 73.662-157.434 73.662-246.338 0-119.666-46.6-232.168-131.216-316.784s-197.118-131.216-316.784-131.216-232.168 46.6-316.784 131.216-131.216 197.118-131.216 316.784 46.6 232.168 131.216 316.784 197.118 131.216 316.784 131.216c88.904 0 173.84-25.74 246.338-73.662l201.662 201.662 128-128zM448 704c-141.16 0-256-114.842-256-256 0-141.16 114.84-256 256-256 141.158 0 256 114.84 256 256 0 141.158-114.842 256-256 256z" + ], + "grid": 16, + "tags": [ + "icon-magnify" + ], + "defaultCode": 77, + "id": 68, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M640 384h-128v-128h-128v128h-128v128h128v128h128v-128h128z", + "M1024 896l-201.662-201.662c47.922-72.498 73.662-157.434 73.662-246.338 0-119.666-46.6-232.168-131.216-316.784s-197.118-131.216-316.784-131.216c-119.666 0-232.168 46.6-316.784 131.216s-131.216 197.118-131.216 316.784c0 119.666 46.6 232.168 131.216 316.784s197.118 131.216 316.784 131.216c88.904 0 173.84-25.74 246.338-73.662l201.662 201.662 128-128zM448 704c-141.16 0-256-114.842-256-256 0-141.16 114.84-256 256-256 141.158 0 256 114.84 256 256 0 141.158-114.842 256-256 256z" + ], + "grid": 16, + "tags": [ + "icon-magnify-in" + ], + "defaultCode": 88, + "id": 66, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M256 384h384v128h-384v-128z", + "M1024 896l-201.662-201.662c47.922-72.498 73.662-157.434 73.662-246.338 0-119.666-46.6-232.168-131.216-316.784s-197.118-131.216-316.784-131.216c-119.666 0-232.168 46.6-316.784 131.216s-131.216 197.118-131.216 316.784c0 119.666 46.6 232.168 131.216 316.784s197.118 131.216 316.784 131.216c88.904 0 173.84-25.74 246.338-73.662l201.662 201.662 128-128zM448 704c-141.16 0-256-114.842-256-256 0-141.16 114.84-256 256-256 141.158 0 256 114.84 256 256 0 141.158-114.842 256-256 256z" + ], + "grid": 16, + "tags": [ + "icon-magnify-out" + ], + "defaultCode": 89, + "id": 67, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M0 0h1024v256h-1024v-256z", + "M0 384h1024v256h-1024v-256z", + "M0 768h1024v256h-1024v-256z" + ], + "grid": 16, + "tags": [ + "icon-menu" + ], + "defaultCode": 109, + "id": 69, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M293.4 512l218.6-218.6 256 256v-421.4c0-70.4-57.6-128-128-128h-512c-70.4 0-128 57.6-128 128v512c0 70.4 57.6 128 128 128h421.4l-256-256z", + "M1024 448h-128v320l-384-384-128 128 384 384h-320v128h576z" + ], + "grid": 16, + "tags": [ + "icon-move" + ], + "defaultCode": 243, + "id": 70, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M448 0v128h320l-384 384 128 128 384-384v320h128v-576z", + "M576 674.274v157.382c-0.1 0.118-0.226 0.244-0.344 0.344h-383.312c-0.118-0.1-0.244-0.226-0.344-0.344v-383.312c0.1-0.118 0.226-0.244 0.344-0.344h157.382l192-192h-349.726c-105.6 0-192 86.4-192 192v384c0 105.6 86.4 192 192 192h384c105.6 0 192-86.4 192-192v-349.726l-192 192z" + ], + "grid": 16, + "tags": [ + "icon-new-window" + ], + "defaultCode": 121, + "id": 71, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M544 224v224c0 88.4-71.6 160-160 160s-160-71.6-160-160v-97.2l-197.4 196.4c-50 50-12.4 215.2 112.4 340s290 162.4 340 112.4l417-423.6-352-352z", + "M896 1024c70.6 0 128-57.4 128-128 0-108.6-128-192-128-192s-128 83.4-128 192c0 70.6 57.4 128 128 128z", + "M384 512c-35.4 0-64-28.6-64-64v-384c0-35.4 28.6-64 64-64s64 28.6 64 64v384c0 35.4-28.6 64-64 64z" + ], + "attrs": [ + { + "fill": "rgb(6, 161, 75)" + }, + { + "fill": "rgb(6, 161, 75)" + }, + { + "fill": "rgb(6, 161, 75)" + } + ], + "grid": 16, + "tags": [ + "icon-paint-bucket" + ], + "colorPermutations": { + "16161751": [ + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + } + ], + "125525525516161751": [ + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + } + ], + "1161751207457516161751": [ + { + "f": 2 + }, + { + "f": 2 + }, + { + "f": 2 + } + ] + }, + "defaultCode": 58886, + "id": 21 + }, + { + "paths": [ + "M126-2h256v1024h-256v-1024z", + "M638-2h256v1024h-256v-1024z" + ], + "grid": 16, + "tags": [ + "icon-pause" + ], + "defaultCode": 241, + "id": 76, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M922.344 101.68c-38.612-38.596-81.306-69.232-120.304-86.324-68.848-30.25-104.77-9.078-120.194 6.344l-516.228 516.216-3.136 9.152-162.482 476.932 485.998-165.612 6.73-6.806 509.502-509.506c9.882-9.866 21.768-27.77 21.768-56.578 0.002-50.71-38.996-121.148-101.654-183.818zM237.982 855.66l-69.73-69.728 69.25-203.228 18.498-6.704h64v128h128v64l-6.846 18.506-203.172 69.154z" + ], + "grid": 16, + "tags": [ + "icon-pencil" + ], + "defaultCode": 112, + "id": 77, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M1024 512l-1024 512v-1024z" + ], + "grid": 16, + "tags": [ + "icon-play" + ], + "defaultCode": 239, + "id": 79, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M255.884 704c0.040-0.034 0.082-0.074 0.116-0.116v-127.884c0-70.58 57.42-128 128-128h255.884c0.040-0.034 0.082-0.074 0.116-0.116v-127.884c0-70.58 57.42-128 128-128h143.658c-93.832-117.038-237.98-192-399.658-192-282.77 0-512 229.23-512 512 0 67.904 13.25 132.704 37.256 192h218.628z", + "M768.116 320c-0.040 0.034-0.082 0.074-0.116 0.116v127.884c0 70.58-57.42 128-128 128h-255.884c-0.040 0.034-0.082 0.074-0.116 0.116v127.884c0 70.58-57.42 128-128 128h-143.658c93.832 117.038 237.98 192 399.658 192 282.77 0 512-229.23 512-512 0-67.904-13.25-132.704-37.256-192h-218.628z" + ], + "grid": 16, + "tags": [ + "icon-plot-resource" + ], + "defaultCode": 233, + "id": 80, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M510 1024l-256-512 256-512h-256l-256 512 256 512z" + ], + "width": 512, + "grid": 16, + "tags": [ + "icon-pointer-left" + ], + "defaultCode": 123, + "id": 22, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M-2 0l256 512-256 512h256l256-512-256-512z" + ], + "width": 512, + "grid": 16, + "tags": [ + "icon-pointer-right" + ], + "defaultCode": 125, + "id": 23, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M1012.8 414.2v-391.6l-127.6 127.4c-96.6-96.8-225.2-150-362-150s-265.2 53.2-362 150c-96.8 96.8-150 225.2-150 362s53.2 265.4 150 362c96.8 96.8 225.2 150 362 150s265.4-53.2 362-150l-136.6-136.6c-124.2 124.2-326.4 124.2-450.8 0-124.2-124.2-124.2-326.4 0-450.8 124.2-124.2 326.4-124.2 450.8 0l-127.4 127.4h391.6z" + ], + "grid": 16, + "tags": [ + "icon-refresh" + ], + "defaultCode": 114, + "id": 27, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M192.2 576c-0.2 0-0.2 0 0 0l-0.2 448h640v-447.8c0 0 0 0-0.2-0.2h-639.6z", + "M978.8 210.8l-165.4-165.4c-25-25-74.2-45.4-109.4-45.4h-576c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128v-448c0-35.2 28.8-64 64-64h640c35.2 0 64 28.8 64 64v448c70.4 0 128-57.6 128-128v-576c0-35.2-20.4-84.4-45.2-109.2zM704 256c0 35.2-28.8 64-64 64h-448c-35.2 0-64-28.8-64-64v-192h320v192h128v-192h128v192z" + ], + "attrs": [ + { + "fill": "rgb(0, 0, 0)" + }, + { + "fill": "rgb(0, 0, 0)" + } + ], + "grid": 16, + "tags": [ + "icon-save-v2" + ], + "colorPermutations": { + "16161751": [ + { + "f": 0 + }, + { + "f": 0 + } + ], + "125525525516161751": [ + { + "f": 0 + }, + { + "f": 0 + } + ], + "1161751207457516161751": [ + { + "f": 0 + }, + { + "f": 0 + } + ] + }, + "defaultCode": 58898, + "id": 11 + }, + { + "paths": [ + "M1022.294 512c-1.746-7.196-3.476-14.452-5.186-21.786-20.036-85.992-53.302-208.976-98-306.538-22.42-48.938-45.298-86.556-69.946-115.006-48.454-55.93-98.176-67.67-131.356-67.67s-82.902 11.74-131.356 67.672c-24.648 28.45-47.528 66.068-69.948 115.006-44.696 97.558-77.962 220.544-98 306.538-21.646 92.898-46.444 175.138-71.71 237.836-16.308 40.46-30.222 66.358-40.6 82.604-10.378-16.246-24.292-42.142-40.6-82.604-23.272-57.75-46.144-132.088-66.524-216.052h-197.362c1.746 7.196 3.476 14.452 5.186 21.786 20.036 85.992 53.302 208.976 98 306.538 22.42 48.938 45.298 86.556 69.946 115.006 48.454 55.932 98.176 67.672 131.356 67.672s82.902-11.74 131.356-67.672c24.648-28.45 47.528-66.068 69.948-115.006 44.696-97.558 77.962-220.544 98-306.538 21.646-92.898 46.444-175.138 71.71-237.836 16.308-40.46 30.222-66.358 40.6-82.604 10.378 16.246 24.292 42.142 40.6 82.604 23.274 57.748 46.146 132.086 66.526 216.050h197.36z" + ], + "grid": 16, + "tags": [ + "icon-sine" + ], + "defaultCode": 54, + "id": 83, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M0 0v256h128v-64h256v704h-192v128h640v-128h-192v-704h256v64h128v-256z" + ], + "grid": 16, + "tags": [ + "icon-T" + ], + "defaultCode": 228, + "id": 84, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M448 382c0 35.2-28.8 64-64 64h-320c-35.2 0-64-28.8-64-64v-320c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v320z", + "M1024 382c0 35.2-28.8 64-64 64h-320c-35.2 0-64-28.8-64-64v-320c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v320z", + "M448 958c0 35.2-28.8 64-64 64h-320c-35.2 0-64-28.8-64-64v-320c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v320z", + "M1024 958c0 35.2-28.8 64-64 64h-320c-35.2 0-64-28.8-64-64v-320c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v320z" + ], + "grid": 16, + "tags": [ + "icon-thumbs-strip" + ], + "defaultCode": 246, + "id": 87, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM128 128h320v768h-320v-768zM896 896h-320v-768h320v768z" + ], + "grid": 16, + "tags": [ + "icon-two-parts-both" + ], + "defaultCode": 229, + "id": 91, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM896 896h-320v-768h320v768z" + ], + "grid": 16, + "tags": [ + "icon-two-parts-one-only" + ], + "defaultCode": 231, + "id": 92, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M512 0c-282.8 0-512 229.2-512 512s229.2 512 512 512 512-229.2 512-512-229.2-512-512-512zM832 704l-128 128-192-192-192 192-128-128 192-192-192-192 128-128 192 192 192-192 128 128-192 192 192 192z" + ], + "grid": 16, + "tags": [ + "icon-x-in-circle" + ], + "defaultCode": 58887, + "id": 16, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M576 64h-256l320 320h-290.256c-44.264-76.516-126.99-128-221.744-128h-128v512h128c94.754 0 177.48-51.484 221.744-128h290.256l-320 320h256l448-448-448-448z" + ], + "grid": 16, + "tags": [ + "icon-activity" + ], + "defaultCode": 97, + "id": 32, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M512 0c-214.866 0-398.786 132.372-474.744 320h90.744c56.86 0 107.938 24.724 143.094 64h240.906l-192-192h256l320 320-320 320h-256l192-192h-240.906c-35.156 39.276-86.234 64-143.094 64h-90.744c75.958 187.628 259.878 320 474.744 320 282.77 0 512-229.23 512-512s-229.23-512-512-512z" + ], + "grid": 16, + "tags": [ + "icon-activity-mode" + ], + "defaultCode": 65, + "id": 31, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M192 0c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h64v-1024h-64z", + "M384 0h256v1024h-256v-1024z", + "M832 0h-64v704h256v-512c0-105.6-86.4-192-192-192z" + ], + "grid": 16, + "tags": [ + "icon-autoflow-tabular" + ], + "defaultCode": 72, + "id": 47, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M512 0c-282.76 0-512 229.24-512 512s229.24 512 512 512 512-229.24 512-512-229.24-512-512-512zM782 690c-12.681 21.673-35.844 36-62.354 36-0.023 0-0.047-0-0.070-0-0.016 0-0.040 0-0.064 0-13.234 0-25.63-3.587-36.269-9.843l-221.644-127.977q-1.2-0.7-2.38-1.46l-0.86-0.56-1.86-1.28-1.26-0.9-1.26-0.96-1.7-1.34-0.64-0.54c-0.72-0.6-1.44-1.22-2.14-1.84v0c-5.012-4.562-9.331-9.758-12.863-15.491-0.457-0.769-0.717-1.249-0.997-1.709s-0.58-0.98-0.86-1.48c-3.092-5.53-5.561-11.936-7.071-18.704l-0.089-0.596c-0.2-0.92-0.38-1.84-0.54-2.76 0-0.28-0.1-0.56-0.16-0.84-0.12-0.7-0.22-1.42-0.3-2.14s-0.14-1.040-0.2-1.58-0.1-1.020-0.14-1.54-0.12-1.5-0.18-2.24c0-0.34 0-0.68 0-1.040q0-1.4 0-2.78c0-0.1 0-0.22 0-0.32v-364.080c0-39.765 32.235-72 72-72s72 32.235 72 72v322.44l185.7 107.22c21.605 12.697 35.879 35.823 35.879 62.284 0 13.278-3.594 25.716-9.862 36.395z" + ], + "grid": 16, + "tags": [ + "icon-clock" + ], + "defaultCode": 67, + "id": 50, + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + } + ], + "isMulticolor": false, + "isMulticolor2": false, + "colorPermutations": { + "1161751207457516161751": [ + { + "f": 1 + } + ] + } + }, + { + "paths": [ + "M1024 192c0 106.039-229.23 192-512 192s-512-85.961-512-192c0-106.039 229.23-192 512-192s512 85.961 512 192z", + "M512 512c-282.77 0-512-85.962-512-192v512c0 106.038 229.23 192 512 192s512-85.962 512-192v-512c0 106.038-229.23 192-512 192z" + ], + "grid": 16, + "tags": [ + "icon-database" + ], + "defaultCode": 68, + "id": 53, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M683.52 819.286c-50.782 28.456-109.284 44.714-171.52 44.714-194.094 0-352-157.906-352-352s157.906-352 352-352 352 157.906 352 352c0 62.236-16.258 120.738-44.714 171.52l191.692 191.692c8.516-13.89 13.022-28.354 13.022-43.212v-640c0-106.038-229.23-192-512-192s-512 85.962-512 192v640c0 106.038 229.23 192 512 192 126.11 0 241.548-17.108 330.776-45.46l-159.256-159.254z", + "M352 512c0 88.224 71.776 160 160 160s160-71.776 160-160-71.776-160-160-160-160 71.776-160 160z" + ], + "grid": 16, + "tags": [ + "icon-database-query" + ], + "defaultCode": 100, + "id": 52, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M896 192h-320c-16.4-16.4-96.8-96.8-109.2-109.2l-37.4-37.4c-25-25-74.2-45.4-109.4-45.4h-256c-35.2 0-64 28.8-64 64v384c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v-128c0-70.4-57.6-128-128-128z", + "M896 448h-768c-70.4 0-128 57.6-128 128v320c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-320c0-70.4-57.6-128-128-128zM320 896h-128v-320h128v320zM576 896h-128v-320h128v320zM832 896h-128v-320h128v320z" + ], + "grid": 16, + "tags": [ + "icon-dataset" + ], + "defaultCode": 58897, + "id": 12, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M1024 192c0 106.039-229.23 192-512 192s-512-85.961-512-192c0-106.039 229.23-192 512-192s512 85.961 512 192z", + "M512 512c-282.8 0-512-86-512-192v512c0 106 229.2 192 512 192s512-86 512-192v-512c0 106-229.2 192-512 192zM896 575v256c-36.6 15.6-79.8 28.8-128 39.4v-256c48.2-10.6 91.4-23.8 128-39.4zM256 614.4v256c-48.2-10.4-91.4-23.8-128-39.4v-256c36.6 15.6 79.8 28.8 128 39.4zM384 890v-256c41 4 83.8 6 128 6s87-2.2 128-6v256c-41 4-83.8 6-128 6s-87-2.2-128-6z" + ], + "attrs": [ + { + "fill": "rgb(6,161,75)", + "opacity": 1 + }, + { + "fill": "rgb(6,161,75)", + "opacity": 1 + } + ], + "grid": 16, + "tags": [ + "icon-datatable" + ], + "colorPermutations": { + "16161751": [ + { + "f": 1 + }, + { + "f": 1 + } + ], + "125525525516161751": [ + { + "f": 1 + }, + { + "f": 1 + } + ], + "1161751207457516161751": [ + { + "f": 2 + }, + { + "f": 2 + } + ] + }, + "defaultCode": 58881, + "id": 17 + }, + { + "paths": [ + "M832 640c105.6 0 192-86.4 192-192v-256c0-105.6-86.4-192-192-192v320l-128-64-128 64v-320h-384c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-192c0 105.6-86.4 192-192 192h-640v-192h640z" + ], + "grid": 16, + "tags": [ + "icon-dictionary" + ], + "defaultCode": 81, + "id": 54, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M896 192h-320c-16.4-16.4-96.8-96.8-109.2-109.2l-37.4-37.4c-25-25-74.2-45.4-109.4-45.4h-256c-35.2 0-64 28.8-64 64v384c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v-128c0-70.4-57.6-128-128-128z", + "M896 448h-768c-70.4 0-128 57.6-128 128v320c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-320c0-70.4-57.6-128-128-128z" + ], + "grid": 16, + "tags": [ + "icon-folder" + ], + "defaultCode": 70, + "id": 57, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM896 896h-768v-768h768v768z", + "M320 256l-128 128v448h640v-320l-128-128-128 128z" + ], + "grid": 16, + "tags": [ + "icon-image" + ], + "defaultCode": 227, + "id": 61, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M448 0h-256c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h256v-1024z", + "M832 0h-256v577.664h448v-385.664c0-105.6-86.4-192-192-192z", + "M576 1024h256c105.6 0 192-86.4 192-192v-129.664h-448v321.664z" + ], + "grid": 16, + "tags": [ + "icon-layout" + ], + "defaultCode": 76, + "id": 63, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M512 1024l512-320v-384l-512.020-320-511.98 320v384l512 320zM512 192l358.4 224-358.4 224-358.4-224 358.4-224z" + ], + "grid": 16, + "tags": [ + "icon-object" + ], + "defaultCode": 111, + "id": 72, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M510-2l-512 320v384l512 320 512-320v-384l-512-320zM585.4 859.2c-21.2 20.8-46 30.8-76 30.8-31.2 0-56.2-9.8-76.2-29.6-20-20-29.6-44.8-29.6-76.2 0-30.4 10.2-55.2 31-76.2s45.2-31.2 74.8-31.2c29.6 0 54.2 10.4 75.6 32s31.8 46.4 31.8 76c-0.2 29-10.8 54-31.4 74.4zM638.2 546.6c-23.6 11.8-37.4 22-43.4 32.4-3.6 6.2-6 14.8-7.4 26.8v41h-161.4v-44.2c0-40.2 4.4-69.8 13-88 8-17.2 22.6-30.2 44.8-40l34.8-15.4c32-14.2 48.2-35.2 48.2-62.8 0-16-6-30.4-17.2-41.8-11.2-11.2-25.6-17.2-41.6-17.2-24 0-54.4 10-62.8 57.4l-2.2 12.2h-147l1.4-16.2c4-44.6 17-82.4 38.8-112.2 19.6-27 45.6-48.6 77-64.6s64.6-24 98.2-24c60.6 0 110.2 19.4 151.4 59.6 41.2 40 61.2 88 61.2 147.2 0 70.8-28.8 121.4-85.8 149.8z" + ], + "grid": 16, + "tags": [ + "icon-object-unknown" + ], + "defaultCode": 63, + "id": 73, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M511.98 0l-511.98 320v512c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-512l-512.020-320zM512 192l358.4 224-358.4 224-358.4-224 358.4-224z" + ], + "grid": 16, + "tags": [ + "icon-packet" + ], + "defaultCode": 86, + "id": 74, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M702 508c-105.6 0-192-86.4-192-192v-320h-320c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-320h-320z", + "M766 380h256l-384-384v256c0 70.4 57.6 128 128 128z" + ], + "grid": 16, + "tags": [ + "icon-page" + ], + "defaultCode": 234, + "id": 75, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "id": 99, + "paths": [ + "M830 0h-636c-106.7 0-194 87.3-194 194v406.82c14.18 18.64 25.66 28.34 32 30.84 14.28-5.62 54.44-47.54 92.96-146 42.46-108.38 116.32-237.66 227.040-237.66 52.4 0 101.42 29.16 145.7 86.68 37.34 48.5 64.84 108.92 81.34 151.080 38.52 98.38 78.68 140.3 92.96 146 14.28-5.62 54.44-47.54 92.96-146 42.46-108.48 116.32-237.76 227.040-237.76 11.354 0.003 22.389 1.366 32.952 3.936l-0.952-57.936c0-106.7-87.3-194-194-194z", + "M992 392.34c-14.28 5.62-54.44 47.52-92.96 146-42.46 108.38-116.32 237.66-227.040 237.66-52.4 0-101.42-29.16-145.7-86.68-37.34-48.5-64.84-108.92-81.34-151.080-38.52-98.38-78.68-140.3-92.96-146-14.28 5.62-54.44 47.52-92.96 146-42.46 108.48-116.32 237.76-227.040 237.76-11.355-0.003-22.389-1.367-32.952-3.936l0.952 57.936c0 106.7 87.3 194 194 194h636c106.7 0 194-87.3 194-194v-406.82c-14.18-18.64-25.66-28.34-32-30.84z" + ], + "attrs": [ + {}, + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 16, + "tags": [ + "icon-plot-overlay" + ], + "colorPermutations": { + "1161751207457516161751": [ + {}, + {} + ] + } + }, + { + "id": 100, + "paths": [ + "M89.6 312c24.98 0 48.96-26.52 85.52-70.18 45.42-54.28 102-121.82 196-121.82 44.64 0 86.62 15.46 124.8 46 28.68 22.9 51.16 50.42 72.92 77.060 38.42 46.94 59.16 68.94 83.96 68.94h371.2v-118c0-106.7-87.3-194-194-194h-636c-106.7 0-194 87.3-194 194v118h89.6z", + "M529.5 410.4c-28.24-22.64-50.52-50-72-76.28-35.5-43.48-58.76-70.12-86.3-70.12-25.060 0-49.080 26.54-85.66 70.24-45.4 54.24-102 121.76-196 121.76h-89.54v112h371.2c44 0 85.54 15.34 123.3 45.6 28.24 22.64 50.52 50 72 76.28 35.5 43.48 58.76 70.12 86.3 70.12 25.060 0 49.080-26.54 85.66-70.24 45.4-54.24 102-121.76 196-121.76h89.54v-112h-371.2c-44.060 0-85.54-15.34-123.3-45.6z", + "M934.4 712c-24.98 0-48.96 26.52-85.52 70.18-45.42 54.28-102 121.82-196 121.82-44.64 0-86.62-15.46-124.8-46-28.68-22.9-51.16-50.42-72.92-77.060-38.42-46.94-59.16-68.94-83.96-68.94h-371.2v118c0 106.7 87.3 194 194 194h636c106.7 0 194-87.3 194-194v-118h-89.6z" + ], + "attrs": [ + {}, + {}, + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "grid": 16, + "tags": [ + "icon-plot-stacked" + ], + "colorPermutations": { + "1161751207457516161751": [ + {}, + {}, + {} + ] + } + }, + { + "paths": [ + "M635.6 524.4c6.6 4.2 13.2 8.6 19.2 13.6l120.4 96.4c29.6 23.8 83.8 23.8 113.4 0l135.2-108c0.2-4.8 0.2-9.4 0.2-14.2 0-52.2-7.8-102.4-22.2-149.8l-154.8 123.6c-58.2 46.6-140.2 59.2-211.4 38.4z", + "M248.6 634.2l120.4-96.4c58-46.4 140-59.2 211.2-38.4-6.6-4.2-13.2-8.6-19.2-13.6l-120.4-96.4c-29.6-23.8-83.8-23.8-113.4 0l-120.2 96.6c-40 32-91.4 48-143 48-21.6 0-43-2.8-63.8-8.4 0 0.6 0 1.2 0 1.6 5 3.4 10 6.8 14.6 10.6l120.4 96.4c29.8 23.8 83.8 23.8 113.4 0z", + "M120.6 378.2l120.4-96.4c80.2-64.2 205.6-64.2 285.8 0l120.4 96.4c29.6 23.8 83.8 23.8 113.4 0l181-144.8c-91.2-140.4-249.6-233.4-429.6-233.4-238.6 0-439.2 163.2-496 384.2 30.8 17.6 77.8 15.6 104.6-6z", + "M689 742l-120.4-96.4c-29.6-23.8-83.8-23.8-113.4 0l-120.2 96.4c-40 32-91.4 48-143 48-47.8 0-95.4-13.8-134.2-41.4 85.6 163.6 256.8 275.4 454.2 275.4s368.6-111.8 454.2-275.4c-80.4 57.4-199.8 55.2-277.2-6.6z" + ], + "attrs": [ + { + "fill": "rgb(6, 161, 75)" + }, + { + "fill": "rgb(6, 161, 75)" + }, + { + "fill": "rgb(6, 161, 75)" + }, + { + "fill": "rgb(6, 161, 75)" + } + ], + "grid": 16, + "tags": [ + "icon-session" + ], + "colorPermutations": { + "16161751": [ + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + } + ], + "1161751207457516161751": [ + { + "f": 2 + }, + { + "f": 2 + }, + { + "f": 2 + }, + { + "f": 2 + } + ] + }, + "defaultCode": 58904, + "id": 5 + }, + { + "paths": [ + "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM640 448h-256v-192h256v192zM384 512h256v192h-256v-192zM320 704h-256v-192h256v192zM320 256v192h-256v-192h256zM128 960c-17 0-33-6.6-45.2-18.8s-18.8-28.2-18.8-45.2v-128h256v192h-192zM384 960v-192h256v192h-256zM960 896c0 17-6.6 33-18.8 45.2s-28.2 18.8-45.2 18.8h-192v-192h256v128zM960 704h-256v-192h256v192zM960 448h-256v-192h256v192z" + ], + "attrs": [ + { + "fill": "rgb(6, 161, 75)" + } + ], + "grid": 16, + "tags": [ + "icon-tabular" + ], + "colorPermutations": { + "16161751": [ + { + "f": 1 + } + ], + "1161751207457516161751": [ + { + "f": 2 + } + ] + }, + "defaultCode": 58884, + "id": 19 + }, + { + "paths": [ + "M896 0h-768c-70.606 0.215-127.785 57.394-128 127.979l-0 768.021c0.215 70.606 57.394 127.785 127.979 128l768.021 0c70.606-0.215 127.785-57.394 128-127.979l0-768.021c-0.215-70.606-57.394-127.785-127.979-128zM64 256h256v192h-256v-192zM64 512h256v192h-256v-192zM128 960c-35.26-0.214-63.786-28.74-64-63.98l-0-128.020h256v192h-192zM384 960v-192h256v192h-256zM960 896c-0.214 35.26-28.74 63.786-63.98 64l-192.020 0v-192h256v128zM960 512v192h-576v-192h64v-64h-64v-192h576v192h-64v64h64z", + "M782.32 547.38l-110.32-55.16v-172.22c0-17.673-14.327-32-32-32s-32 14.327-32 32v211.78l145.68 72.84c4.172 2.133 9.1 3.383 14.32 3.383 17.675 0 32.003-14.328 32.003-32.003 0-12.454-7.114-23.247-17.501-28.536z" + ], + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + } + ], + "grid": 16, + "tags": [ + "icon-tabular-lad" + ], + "colorPermutations": { + "16161751": [], + "1161751207457516161751": [ + { + "f": 1 + }, + { + "f": 1 + } + ] + }, + "defaultCode": 58913, + "id": 2 + }, + { + "paths": [ + "M128 768v-576c-70.606 0.215-127.785 57.394-128 127.979l-0 576.021c0.215 70.606 57.394 127.785 127.979 128l576.021 0c70.606-0.215 127.785-57.394 128-127.979l-576-0.021c-70.606-0.215-127.785-57.394-128-127.979z", + "M896 0h-576c-70.606 0.215-127.785 57.394-128 127.979l-0 576.021c0.215 70.606 57.394 127.785 127.979 128l576.021 0c70.606-0.215 127.785-57.394 128-127.979l0-576.021c-0.215-70.606-57.394-127.785-127.979-128zM256 192h192v128h-192v-128zM256 384h192v192h-192v-192zM320 768c-35.26-0.214-63.786-28.74-64-63.98l-0-64.020h192v128h-128zM512 768v-128h192v128h-192zM960 704c-0.214 35.26-28.74 63.786-63.98 64l-128.020 0v-128h192v64zM960 576h-448v-384h448v384z", + "M832 480c0.002 0 0.005 0 0.007 0 17.673 0 32-14.327 32-32 0-14.055-9.062-25.994-21.662-30.293l-74.345-24.767v-104.94c0-17.673-14.327-32-32-32s-32 14.327-32 32v151.060l117.88 39.3c3.018 1.040 6.495 1.64 10.113 1.64 0.003 0 0.005-0 0.008-0z" + ], + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + }, + { + "fill": "rgb(0, 161, 75)" + } + ], + "grid": 16, + "tags": [ + "icon-tabular-lad-set" + ], + "colorPermutations": { + "16161751": [], + "1161751207457516161751": [ + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + } + ] + }, + "defaultCode": 58914, + "id": 1 + }, + { + "paths": [ + "M896 0h-768c-70.606 0.215-127.785 57.394-128 127.979l-0 768.021c0.215 70.606 57.394 127.785 127.979 128l768.021 0c70.606-0.215 127.785-57.394 128-127.979l0-768.021c-0.215-70.606-57.394-127.785-127.979-128zM448 292l25.060 25.32c7.916 7.922 18.856 12.822 30.94 12.822s23.024-4.9 30.94-12.822l75.5-76.3c29.97-30.338 71.571-49.128 117.56-49.128s87.59 18.79 117.544 49.112l50.456 50.997v152.2c-24.111-8.83-44.678-22.255-61.542-39.342l-75.518-76.318c-7.916-7.922-18.856-12.822-30.94-12.822s-23.024 4.9-30.94 12.822l-75.5 76.3c-29.971 30.343-71.575 49.137-117.568 49.137-20.084 0-39.331-3.584-57.137-10.146l1.145-151.831zM320 960h-192c-35.26-0.214-63.786-28.74-64-63.98l-0-128.020h256v192zM320 704h-256v-192h256v192zM320 448h-256v-192h256v192zM640 960h-256v-192h256v192zM448 636.62v-174.5c1.88 1.74 3.74 3.5 5.56 5.34l75.5 76.3c7.916 7.922 18.856 12.822 30.94 12.822s23.024-4.9 30.94-12.822l75.5-76.3c29.966-30.333 71.56-49.119 117.542-49.119 43.28 0 82.673 16.644 112.128 43.879l-0.11 174.399c-1.88-1.74-3.74-3.5-5.56-5.34l-75.5-76.3c-7.916-7.922-18.856-12.822-30.94-12.822s-23.024 4.9-30.94 12.822l-75.5 76.3c-29.966 30.333-71.56 49.119-117.542 49.119-43.28 0-82.673-16.644-112.128-43.879zM960 896c-0.214 35.26-28.74 63.786-63.98 64l-192.020 0v-192h256v128z" + ], + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + } + ], + "grid": 16, + "tags": [ + "icon-tabular-realtime-v2" + ], + "colorPermutations": { + "16161751": [], + "1161751207457516161751": [ + { + "f": 1 + } + ] + }, + "defaultCode": 58912, + "id": 3 + }, + { + "paths": [ + "M64 0c-35.2 0-64 28.8-64 64v192h448v-256h-384z", + "M1024 256v-192c0-35.2-28.8-64-64-64h-384v256h448z", + "M0 384v192c0 35.2 28.8 64 64 64h384v-256h-448z", + "M960 640c35.2 0 64-28.8 64-64v-192h-448v256h384z", + "M512 1024l-256-256h512z" + ], + "attrs": [ + { + "fill": "rgb(6,161,75)", + "opacity": 1 + }, + { + "fill": "rgb(6,161,75)", + "opacity": 1 + }, + { + "fill": "rgb(6,161,75)", + "opacity": 1 + }, + { + "fill": "rgb(6,161,75)", + "opacity": 1 + }, + { + "fill": "rgb(6,161,75)", + "opacity": 1 + } + ], + "grid": 16, + "tags": [ + "icon-tabular-scrolling" + ], + "colorPermutations": { + "16161751": [ + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + } + ], + "125525525516161751": [ + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + }, + { + "f": 1 + } + ], + "1161751207457516161751": [ + { + "f": 2 + }, + { + "f": 2 + }, + { + "f": 2 + }, + { + "f": 2 + }, + { + "f": 2 + } + ] + }, + "defaultCode": 58882, + "id": 18 + }, + { + "paths": [ + "M32 631.66c14.28-5.62 54.44-47.54 92.96-146 42.46-108.38 116.32-237.66 227.040-237.66 52.4 0 101.42 29.16 145.7 86.68 37.34 48.5 64.84 108.92 81.34 151.080 38.52 98.38 78.68 140.3 92.96 146 14.28-5.62 54.44-47.54 92.96-146 37.4-95.5 99.14-207.14 188.94-232.46-90.462-152.598-254.314-253.3-441.686-253.3-0.075 0-0.15 0-0.226 0-282.748-0-511.988 229.24-511.988 512-0 0.032-0 0.070-0 0.108 0 35.719 3.641 70.587 10.572 104.255 8.968 7.457 16.648 13.417 21.428 15.297z", + "M992 392.34c-14.28 5.62-54.44 47.52-92.96 146-42.46 108.38-116.32 237.66-227.040 237.66-52.4 0-101.42-29.16-145.7-86.68-37.34-48.5-64.84-108.92-81.34-151.080-38.52-98.38-78.68-140.3-92.96-146-14.28 5.62-54.44 47.52-92.96 146-37.4 95.5-99.14 207.14-188.94 232.46 90.462 152.598 254.314 253.3 441.686 253.3 0.075 0 0.15-0 0.226-0 282.748 0 511.988-229.24 511.988-512 0-0.032 0-0.070 0-0.108 0-35.719-3.641-70.587-10.572-104.255-8.968-7.457-16.648-13.417-21.428-15.297z" + ], + "grid": 16, + "tags": [ + "icon-telemetry" + ], + "defaultCode": 84, + "id": 86, + "attrs": [ + {}, + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "colorPermutations": { + "1161751207457516161751": [ + {}, + {} + ] + } + }, + { + "paths": [ + "M169.2 448c14-56.4 33-122 56.6-176.8 15.4-35.8 31.2-63.2 48.2-84 18.4-22.4 49-49.2 91-49.2s72.6 26.8 91 49.2c17 20.6 32.6 48.2 48.2 84 23.6 54.8 42.8 120.4 56.6 176.8h461.2v-256c0-105.6-86.4-192-192-192h-640c-105.6 0-192 86.4-192 192v256h171.2z", + "M718.6 576h-127.2c25 93.4 48.4 144.4 63.6 168.6 15.2-24.2 38.6-75.2 63.6-168.6z", + "M301.4 448h127.2c-25-93.4-48.4-144.4-63.6-168.6-15.2 24.2-38.6 75.2-63.6 168.6z", + "M850.8 576c-14 56.4-33 122-56.6 176.8-15.4 35.8-31.2 63.2-48.2 84-18.4 22.4-49 49.2-91 49.2s-72.6-26.8-91-49.2c-17-20.6-32.6-48.2-48.2-84-23.6-54.8-42.8-120.4-56.6-176.8h-461.2v256c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-256h-171.2z" + ], + "grid": 16, + "tags": [ + "icon-telemetry-panel" + ], + "defaultCode": 116, + "id": 85, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M256 256h384v128h-384v-128z", + "M384 448h384v128h-384v-128z", + "M320 640h384v128h-384v-128z", + "M832 0h-128v192h127.6c0.2 0 0.2 0.2 0.4 0.4v639.4c0 0.2-0.2 0.2-0.4 0.4h-127.6v192h128c105.6 0 192-86.4 192-192v-640.2c0-105.6-86.4-192-192-192z", + "M192 831.6v-639.2c0-0.2 0.2-0.2 0.4-0.4h127.6v-192h-128c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h128v-192h-127.6c-0.2 0-0.4-0.2-0.4-0.4z" + ], + "grid": 16, + "tags": [ + "icon-timeline" + ], + "defaultCode": 83, + "id": 88, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "id": 101, + "paths": [ + "M576 146.6v-82.58c0-35.346-28.654-64-64-64h-128c-35.346 0-64 28.654-64 64v82.58c-185.040 55.080-320 226.48-320 429.42 0 247.42 200.58 448 448 448s448-200.58 448-448c0-202.96-135-374.4-320-429.42zM468 596.020l-263.76 211c-57.105-59.935-92.24-141.251-92.24-230.772 0-0.080 0-0.16 0-0.24-0-185.268 150.72-335.988 336-335.988 6.72 0 13.38 0.22 20 0.62v355.38z" + ], + "attrs": [ + { + "fill": "rgb(0, 161, 75)" + } + ], + "width": 896, + "isMulticolor": false, + "isMulticolor2": false, + "grid": 16, + "tags": [ + "icon-timer-v1.5" + ], + "colorPermutations": { + "1161751207457516161751": [ + { + "f": 1 + } + ] + } + }, + { + "paths": [ + "M454.36 476.64l86.3-86.3c9.088-8.965 21.577-14.502 35.36-14.502s26.272 5.537 35.366 14.507l86.294 86.294c19.328 19.358 42.832 34.541 69.047 44.082l1.313-171.722-57.64-57.64c-34.407-34.33-81.9-55.558-134.35-55.558s-99.943 21.228-134.354 55.562l-86.296 86.297c-9.088 8.965-21.577 14.502-35.36 14.502s-26.272-5.537-35.366-14.507l-28.674-28.654v172.14c19.045 7.022 41.040 11.084 63.984 11.084 52.463 0 99.966-21.239 134.379-55.587z", + "M505.64 547.36l-86.3 86.3c-9.088 8.965-21.577 14.502-35.36 14.502s-26.272-5.537-35.366-14.507l-86.294-86.294c-2-2-4.2-4-6.36-6v197.36c33.664 30.72 78.65 49.537 128.031 49.537 52.44 0 99.923-21.22 134.333-55.541l86.296-86.296c9.088-8.965 21.577-14.502 35.36-14.502s26.272 5.537 35.366 14.507l86.294 86.294c2 2 4.2 4 6.36 6v-197.36c-33.664-30.72-78.65-49.537-128.031-49.537-52.44 0-99.923 21.22-134.333 55.541z", + "M832 0h-128v192h127.66l0.34 0.34v639.32l-0.34 0.34h-127.66v192h128c105.6 0 192-86.4 192-192v-640c0-105.6-86.4-192-192-192z", + "M320 832h-127.66l-0.34-0.34v-639.32l0.34-0.34h127.66v-192h-128c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h128v-192z" + ], + "grid": 16, + "tags": [ + "icon-topic" + ], + "defaultCode": 58903, + "id": 6, + "attrs": [], + "colorPermutations": { + "1161751207457516161751": [] + } + }, + { + "paths": [ + "M0 384h128v256h-128v-256z", + "M128 128.22l0.22-0.22h191.78v-128h-192c-70.606 0.215-127.785 57.394-128 127.979l-0 192.021h128v-191.78z", + "M128 895.78v-191.78h-128v192c0.215 70.606 57.394 127.785 127.979 128l192.021 0v-128h-191.78z", + "M384 0h256v128h-256v-128z", + "M896 895.78l-0.22 0.22h-191.78v128h192c70.606-0.215 127.785-57.394 128-127.979l0-192.021h-128v191.78z", + "M896 0h-192v128h191.78l0.22 0.22v191.78h128v-192c-0.215-70.606-57.394-127.785-127.979-128z", + "M896 384h128v256h-128v-256z", + "M384 896h256v128h-256v-128z", + "M256 256h512v512h-512v-512z" + ], + "grid": 16, + "tags": [ + "icon-box-with-dashed-lines" + ], + "defaultCode": 51, + "id": 29, + "attrs": [ + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {} + ], + "isMulticolor": false, + "isMulticolor2": false, + "colorPermutations": { + "1161751207457516161751": [ + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {}, + {} + ] + } + } + ], + "colorThemes": [ + [ + [ + 0, + 0, + 0, + 1 + ], + [ + 0, + 161, + 75, + 1 + ], + [ + 6, + 161, + 75, + 1 + ], + [ + 207, + 45, + 75, + 1 + ] + ] + ], + "colorThemeIdx": 0, + "preferences": { + "showGlyphs": true, + "showQuickUse": true, + "showQuickUse2": true, + "showSVGs": true, + "fontPref": { + "prefix": "", + "metadata": { + "fontFamily": "wtdsymbols", + "majorVersion": 2, + "minorVersion": 0 + }, + "metrics": { + "emSize": 1024, + "baseline": 6.25, + "whitespace": 50 + }, + "resetPoint": 58880, + "showVersion": true, + "showSelector": true, + "selector": "class", + "classSelector": ".ui-symbol", + "showMetrics": true, + "showMetadata": true, + "embed": false + }, + "imagePref": { + "prefix": "icon-", + "png": true, + "useClassSelector": true, + "color": 4473924, + "bgColor": 16777215, + "classSelector": ".icon" + }, + "historySize": 100, + "showCodes": true, + "gridSize": 16, + "showLiga": false + }, + "id": 1, + "invisible": false + } + ], + "preferences": { + "showGlyphs": true, + "showQuickUse": true, + "showQuickUse2": true, + "showSVGs": true, + "fontPref": { + "prefix": "", + "metadata": { + "fontFamily": "openmct-symbols-16px", + "majorVersion": 2, + "minorVersion": 0 + }, + "metrics": { + "emSize": 1024, + "baseline": 6.25, + "whitespace": 50 + }, + "resetPoint": 58880, + "showVersion": true, + "showSelector": true, + "selector": "class", + "classSelector": ".ui-symbol", + "showMetrics": true, + "showMetadata": true, + "embed": false + }, + "imagePref": { + "prefix": "icon-", + "png": true, + "useClassSelector": true, + "color": 4473924, + "bgColor": 16777215, + "classSelector": ".icon" + }, + "historySize": 100, + "showCodes": true, + "gridSize": 16, + "showLiga": false, + "showGrid": true + }, + "uid": -1 +} \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json b/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json deleted file mode 100644 index df4c4cedc1..0000000000 --- a/platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json +++ /dev/null @@ -1,2758 +0,0 @@ -{ - "metadata": { - "name": "Untitled Project", - "lastOpened": 1464711493714, - "created": 1464711419511 - }, - "iconSets": [ - { - "selection": [ - { - "order": 5, - "id": 95, - "prevSize": 32, - "code": 58915, - "name": "icon-download", - "tempChar": "" - }, - { - "order": 6, - "prevSize": 32, - "name": "icon-tabular-lad-set", - "id": 1, - "code": 58914, - "tempChar": "" - }, - { - "order": 7, - "prevSize": 32, - "name": "icon-tabular-lad", - "id": 2, - "code": 58913, - "tempChar": "" - }, - { - "order": 8, - "prevSize": 32, - "name": "icon-tabular-realtime", - "id": 3, - "code": 58912, - "tempChar": "" - }, - { - "order": 9, - "prevSize": 32, - "name": "icon-bullet", - "id": 4, - "code": 58905, - "tempChar": "" - }, - { - "order": 10, - "prevSize": 32, - "name": "icon-session", - "id": 5, - "code": 58904, - "tempChar": "" - }, - { - "order": 11, - "prevSize": 32, - "name": "icon-topic", - "id": 6, - "code": 58903, - "tempChar": "" - }, - { - "order": 12, - "prevSize": 32, - "name": "icon-eye-open-no-gleam", - "id": 7, - "code": 58902, - "tempChar": "" - }, - { - "order": 13, - "prevSize": 32, - "name": "icon-eye-open", - "id": 8, - "code": 58901, - "tempChar": "" - }, - { - "order": 14, - "prevSize": 32, - "name": "icon-collapse-pane-left", - "id": 9, - "code": 58899, - "tempChar": "" - }, - { - "order": 15, - "prevSize": 32, - "name": "icon-collapse-pane-right", - "id": 10, - "code": 58900, - "tempChar": "" - }, - { - "order": 16, - "prevSize": 32, - "name": "icon-save", - "id": 11, - "code": 58898, - "tempChar": "" - }, - { - "order": 17, - "prevSize": 32, - "name": "icon-dataset", - "id": 12, - "code": 58897, - "tempChar": "" - }, - { - "order": 18, - "prevSize": 32, - "name": "icon-bell", - "id": 13, - "code": 58896, - "tempChar": "" - }, - { - "order": 19, - "prevSize": 32, - "name": "icon-hourglass", - "id": 14, - "code": 58889, - "tempChar": "" - }, - { - "order": 20, - "prevSize": 32, - "codes": [ - 58888, - 58889, - 58890 - ], - "name": "icon-info-v15", - "id": 15, - "code": 58888, - "tempChar": "" - }, - { - "order": 21, - "prevSize": 32, - "name": "icon-x-in-circle", - "id": 16, - "code": 58887, - "tempChar": "" - }, - { - "order": 22, - "prevSize": 32, - "name": "icon-datatable", - "id": 17, - "code": 58881, - "tempChar": "" - }, - { - "order": 23, - "prevSize": 32, - "name": "icon-tabular-scrolling", - "id": 18, - "code": 58882, - "tempChar": "" - }, - { - "order": 24, - "prevSize": 32, - "name": "icon-tabular", - "id": 19, - "code": 58884, - "tempChar": "" - }, - { - "order": 25, - "prevSize": 32, - "name": "icon-calendar", - "id": 20, - "code": 58885, - "tempChar": "" - }, - { - "order": 26, - "prevSize": 32, - "name": "icon-paint-bucket", - "id": 21, - "code": 58886, - "tempChar": "" - }, - { - "order": 27, - "prevSize": 32, - "name": "icon-pointer-left", - "id": 22, - "code": 123, - "tempChar": "" - }, - { - "order": 28, - "prevSize": 32, - "name": "icon-pointer-right", - "id": 23, - "code": 125, - "tempChar": "" - }, - { - "order": 29, - "prevSize": 32, - "name": "icon-person", - "id": 24, - "code": 80, - "tempChar": "" - }, - { - "order": 30, - "prevSize": 32, - "name": "icon-chain-links", - "id": 25, - "code": 232, - "tempChar": "" - }, - { - "order": 31, - "prevSize": 32, - "name": "icon-database-in-brackets", - "id": 26, - "code": 115, - "tempChar": "" - }, - { - "order": 32, - "prevSize": 32, - "name": "icon-refresh", - "id": 27, - "code": 114, - "tempChar": "" - }, - { - "order": 33, - "prevSize": 32, - "name": "icon-lock", - "id": 28, - "code": 108, - "tempChar": "" - }, - { - "order": 34, - "prevSize": 32, - "name": "icon-box-with-dashed-lines", - "id": 29, - "code": 51, - "tempChar": "" - }, - { - "order": 35, - "prevSize": 32, - "name": "icon-box-with-arrow-cursor", - "id": 30, - "code": 58880, - "tempChar": "" - }, - { - "order": 36, - "prevSize": 32, - "name": "icon-activity-mode", - "id": 31, - "code": 65, - "tempChar": "" - }, - { - "order": 37, - "prevSize": 32, - "name": "icon-activity", - "id": 32, - "code": 97, - "tempChar": "" - }, - { - "order": 38, - "prevSize": 32, - "name": "icon-alert-rect", - "id": 33, - "code": 33, - "tempChar": "" - }, - { - "order": 39, - "prevSize": 32, - "name": "icon-alert-triangle", - "id": 34, - "code": 58883, - "tempChar": "" - }, - { - "order": 40, - "prevSize": 32, - "name": "icon-arrow-double-down", - "id": 35, - "code": 238, - "tempChar": "" - }, - { - "order": 41, - "prevSize": 32, - "name": "icon-arrow-double-up", - "id": 36, - "code": 235, - "tempChar": "" - }, - { - "order": 42, - "prevSize": 32, - "name": "icon-arrow-down", - "id": 37, - "code": 118, - "tempChar": "" - }, - { - "order": 43, - "prevSize": 32, - "name": "icon-arrow-left", - "id": 38, - "code": 60, - "tempChar": "" - }, - { - "order": 44, - "prevSize": 32, - "name": "icon-arrow-right", - "id": 39, - "code": 62, - "tempChar": "" - }, - { - "order": 45, - "prevSize": 32, - "name": "icon-arrow-tall-down", - "id": 40, - "code": 236, - "tempChar": "" - }, - { - "order": 46, - "prevSize": 32, - "name": "icon-arrow-tall-up", - "id": 41, - "code": 237, - "tempChar": "" - }, - { - "order": 47, - "prevSize": 32, - "name": "icon-arrow-up", - "id": 42, - "code": 94, - "tempChar": "" - }, - { - "order": 48, - "prevSize": 32, - "name": "icon-arrows-out", - "id": 43, - "code": 73, - "tempChar": "" - }, - { - "order": 49, - "prevSize": 32, - "name": "icon-arrows-right-left", - "id": 44, - "code": 58893, - "tempChar": "" - }, - { - "order": 50, - "prevSize": 32, - "name": "icon-arrows-up-down", - "id": 45, - "code": 53, - "tempChar": "" - }, - { - "order": 51, - "prevSize": 32, - "name": "icon-asterisk", - "id": 46, - "code": 42, - "tempChar": "" - }, - { - "order": 52, - "prevSize": 32, - "name": "icon-autoflow-tabular", - "id": 47, - "code": 72, - "tempChar": "" - }, - { - "order": 53, - "prevSize": 32, - "name": "icon-box", - "id": 48, - "code": 224, - "tempChar": "" - }, - { - "order": 54, - "prevSize": 32, - "name": "icon-check", - "id": 49, - "code": 50, - "tempChar": "" - }, - { - "order": 55, - "prevSize": 32, - "name": "icon-clock", - "id": 50, - "code": 67, - "tempChar": "" - }, - { - "order": 56, - "prevSize": 32, - "name": "icon-connectivity", - "id": 51, - "code": 46, - "tempChar": "" - }, - { - "order": 57, - "prevSize": 32, - "name": "icon-database-query", - "id": 52, - "code": 100, - "tempChar": "" - }, - { - "order": 58, - "prevSize": 32, - "name": "icon-database", - "id": 53, - "code": 68, - "tempChar": "" - }, - { - "order": 59, - "prevSize": 32, - "name": "icon-dictionary", - "id": 54, - "code": 81, - "tempChar": "" - }, - { - "order": 60, - "prevSize": 32, - "name": "icon-duplicate", - "id": 55, - "code": 242, - "tempChar": "" - }, - { - "order": 61, - "prevSize": 32, - "name": "icon-folder-new", - "id": 56, - "code": 102, - "tempChar": "" - }, - { - "order": 62, - "prevSize": 32, - "name": "icon-folder", - "id": 57, - "code": 70, - "tempChar": "" - }, - { - "order": 63, - "prevSize": 32, - "name": "icon-fullscreen-collapse", - "id": 58, - "code": 95, - "tempChar": "" - }, - { - "order": 64, - "prevSize": 32, - "name": "icon-fullscreen-expand", - "id": 59, - "code": 122, - "tempChar": "" - }, - { - "order": 65, - "prevSize": 32, - "name": "icon-gear", - "id": 60, - "code": 71, - "tempChar": "" - }, - { - "order": 66, - "prevSize": 32, - "name": "icon-image", - "id": 61, - "code": 227, - "tempChar": "" - }, - { - "order": 67, - "prevSize": 32, - "name": "icon-layers", - "id": 62, - "code": 225, - "tempChar": "" - }, - { - "order": 68, - "prevSize": 32, - "name": "icon-layout", - "id": 63, - "code": 76, - "tempChar": "" - }, - { - "order": 69, - "prevSize": 32, - "name": "icon-line-horz", - "id": 64, - "code": 226, - "tempChar": "" - }, - { - "order": 70, - "prevSize": 32, - "name": "icon-link", - "id": 65, - "code": 244, - "tempChar": "" - }, - { - "order": 71, - "prevSize": 32, - "name": "icon-magnify-in", - "id": 66, - "code": 88, - "tempChar": "" - }, - { - "order": 72, - "prevSize": 32, - "name": "icon-magnify-out", - "id": 67, - "code": 89, - "tempChar": "" - }, - { - "order": 73, - "prevSize": 32, - "name": "icon-magnify", - "id": 68, - "code": 77, - "tempChar": "" - }, - { - "order": 74, - "prevSize": 32, - "name": "icon-menu", - "id": 69, - "code": 109, - "tempChar": "" - }, - { - "order": 75, - "prevSize": 32, - "name": "icon-move", - "id": 70, - "code": 243, - "tempChar": "" - }, - { - "order": 76, - "prevSize": 32, - "name": "icon-new-window", - "id": 71, - "code": 121, - "tempChar": "" - }, - { - "order": 77, - "prevSize": 32, - "name": "icon-object", - "id": 72, - "code": 111, - "tempChar": "" - }, - { - "order": 78, - "prevSize": 32, - "name": "icon-object-unknown", - "id": 73, - "code": 63, - "tempChar": "" - }, - { - "order": 79, - "prevSize": 32, - "name": "icon-packet", - "id": 74, - "code": 86, - "tempChar": "" - }, - { - "order": 80, - "prevSize": 32, - "name": "icon-page", - "id": 75, - "code": 234, - "tempChar": "" - }, - { - "order": 81, - "prevSize": 32, - "name": "icon-pause", - "id": 76, - "code": 241, - "tempChar": "" - }, - { - "order": 82, - "prevSize": 32, - "name": "icon-pencil", - "id": 77, - "code": 112, - "tempChar": "" - }, - { - "order": 83, - "prevSize": 32, - "name": "icon-people", - "id": 78, - "code": 79, - "tempChar": "" - }, - { - "order": 84, - "prevSize": 32, - "name": "icon-play", - "id": 79, - "code": 239, - "tempChar": "" - }, - { - "order": 85, - "prevSize": 32, - "name": "icon-plot-resource", - "id": 80, - "code": 233, - "tempChar": "" - }, - { - "order": 86, - "prevSize": 32, - "name": "icon-plus", - "id": 81, - "code": 43, - "tempChar": "" - }, - { - "order": 87, - "prevSize": 32, - "name": "icon-minus", - "id": 82, - "code": 45, - "tempChar": "" - }, - { - "order": 88, - "prevSize": 32, - "name": "icon-sine", - "id": 83, - "code": 54, - "tempChar": "" - }, - { - "order": 89, - "prevSize": 32, - "name": "icon-T", - "id": 84, - "code": 228, - "tempChar": "" - }, - { - "order": 90, - "prevSize": 32, - "name": "icon-telemetry-panel", - "id": 85, - "code": 116, - "tempChar": "" - }, - { - "order": 91, - "prevSize": 32, - "name": "icon-telemetry", - "id": 86, - "code": 84, - "tempChar": "" - }, - { - "order": 92, - "prevSize": 32, - "name": "icon-thumbs-strip", - "id": 87, - "code": 246, - "tempChar": "" - }, - { - "order": 93, - "prevSize": 32, - "name": "icon-timeline", - "id": 88, - "code": 83, - "tempChar": "" - }, - { - "order": 94, - "prevSize": 32, - "name": "icon-timer", - "id": 89, - "code": 245, - "tempChar": "" - }, - { - "order": 95, - "prevSize": 32, - "name": "icon-trash", - "id": 90, - "code": 90, - "tempChar": "" - }, - { - "order": 96, - "prevSize": 32, - "name": "icon-two-parts-both", - "id": 91, - "code": 229, - "tempChar": "" - }, - { - "order": 97, - "prevSize": 32, - "name": "icon-two-parts-one-only", - "id": 92, - "code": 231, - "tempChar": "" - }, - { - "order": 98, - "prevSize": 32, - "name": "icon-x-heavy", - "id": 93, - "code": 120, - "tempChar": "" - }, - { - "order": 99, - "prevSize": 32, - "name": "icon-x", - "id": 94, - "code": 58946, - "tempChar": "" - } - ], - "metadata": { - "name": "Open MCT UI Symbols", - "importSize": { - "width": 512, - "height": 512 - }, - "designer": "Charles Hacskaylo", - "iconsHash": 1484196519 - }, - "height": 1024, - "prevSize": 32, - "icons": [ - { - "id": 95, - "paths": [ - "M832 576v255.66l-0.34 0.34-639.66-0.34v-255.66h-192v256c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-256h-192z", - "M512 640l448-448h-256v-192h-384v192h-256l448 448z" - ], - "attrs": [ - { - "fill": "rgb(0, 161, 75)" - }, - { - "fill": "rgb(0, 161, 75)" - } - ], - "isMulticolor": false, - "grid": 0, - "tags": [ - "icon-download" - ], - "colorPermutations": { - "11617516161751": [ - 1, - 1 - ] - } - }, - { - "paths": [ - "M128 768v-576c-70.606 0.215-127.785 57.394-128 127.979l-0 576.021c0.215 70.606 57.394 127.785 127.979 128l576.021 0c70.606-0.215 127.785-57.394 128-127.979l-576-0.021c-70.606-0.215-127.785-57.394-128-127.979z", - "M896 0h-576c-70.606 0.215-127.785 57.394-128 127.979l-0 576.021c0.215 70.606 57.394 127.785 127.979 128l576.021 0c70.606-0.215 127.785-57.394 128-127.979l0-576.021c-0.215-70.606-57.394-127.785-127.979-128zM256 192h192v128h-192v-128zM256 384h192v192h-192v-192zM320 768c-35.26-0.214-63.786-28.74-64-63.98l-0-64.020h192v128h-128zM512 768v-128h192v128h-192zM960 704c-0.214 35.26-28.74 63.786-63.98 64l-128.020 0v-128h192v64zM960 576h-448v-384h448v384z", - "M832 480c0.002 0 0.005 0 0.007 0 17.673 0 32-14.327 32-32 0-14.055-9.062-25.994-21.662-30.293l-74.345-24.767v-104.94c0-17.673-14.327-32-32-32s-32 14.327-32 32v151.060l117.88 39.3c3.018 1.040 6.495 1.64 10.113 1.64 0.003 0 0.005-0 0.008-0z" - ], - "attrs": [ - { - "fill": "rgb(0, 161, 75)" - }, - { - "fill": "rgb(0, 161, 75)" - }, - { - "fill": "rgb(0, 161, 75)" - } - ], - "grid": 0, - "tags": [ - "icon-tabular-lad-set" - ], - "colorPermutations": { - "16161751": [], - "11617516161751": [ - 1, - 1, - 1 - ] - }, - "defaultCode": 58914, - "id": 1 - }, - { - "paths": [ - "M896 0h-768c-70.606 0.215-127.785 57.394-128 127.979l-0 768.021c0.215 70.606 57.394 127.785 127.979 128l768.021 0c70.606-0.215 127.785-57.394 128-127.979l0-768.021c-0.215-70.606-57.394-127.785-127.979-128zM64 256h256v192h-256v-192zM64 512h256v192h-256v-192zM128 960c-35.26-0.214-63.786-28.74-64-63.98l-0-128.020h256v192h-192zM384 960v-192h256v192h-256zM960 896c-0.214 35.26-28.74 63.786-63.98 64l-192.020 0v-192h256v128zM960 512v192h-576v-192h64v-64h-64v-192h576v192h-64v64h64z", - "M782.32 547.38l-110.32-55.16v-172.22c0-17.673-14.327-32-32-32s-32 14.327-32 32v211.78l145.68 72.84c4.172 2.133 9.1 3.383 14.32 3.383 17.675 0 32.003-14.328 32.003-32.003 0-12.454-7.114-23.247-17.501-28.536z" - ], - "attrs": [ - { - "fill": "rgb(0, 161, 75)" - }, - { - "fill": "rgb(0, 161, 75)" - } - ], - "grid": 0, - "tags": [ - "icon-tabular-lad" - ], - "colorPermutations": { - "16161751": [], - "11617516161751": [ - 1, - 1 - ] - }, - "defaultCode": 58913, - "id": 2 - }, - { - "paths": [ - "M896 0h-768c-70.606 0.215-127.785 57.394-128 127.979l-0 768.021c0.215 70.606 57.394 127.785 127.979 128l768.021 0c70.606-0.215 127.785-57.394 128-127.979l0-768.021c-0.215-70.606-57.394-127.785-127.979-128zM448 292l25.060 25.32c7.916 7.922 18.856 12.822 30.94 12.822s23.024-4.9 30.94-12.822l75.5-76.3c29.97-30.338 71.571-49.128 117.56-49.128s87.59 18.79 117.544 49.112l50.456 50.997v152.2c-24.111-8.83-44.678-22.255-61.542-39.342l-75.518-76.318c-7.916-7.922-18.856-12.822-30.94-12.822s-23.024 4.9-30.94 12.822l-75.5 76.3c-29.971 30.343-71.575 49.137-117.568 49.137-20.084 0-39.331-3.584-57.137-10.146l1.145-151.831zM320 960h-192c-35.26-0.214-63.786-28.74-64-63.98l-0-128.020h256v192zM320 704h-256v-192h256v192zM320 448h-256v-192h256v192zM640 960h-256v-192h256v192zM448 636.62v-174.5c1.88 1.74 3.74 3.5 5.56 5.34l75.5 76.3c7.916 7.922 18.856 12.822 30.94 12.822s23.024-4.9 30.94-12.822l75.5-76.3c29.966-30.333 71.56-49.119 117.542-49.119 43.28 0 82.673 16.644 112.128 43.879l-0.11 174.399c-1.88-1.74-3.74-3.5-5.56-5.34l-75.5-76.3c-7.916-7.922-18.856-12.822-30.94-12.822s-23.024 4.9-30.94 12.822l-75.5 76.3c-29.966 30.333-71.56 49.119-117.542 49.119-43.28 0-82.673-16.644-112.128-43.879zM960 896c-0.214 35.26-28.74 63.786-63.98 64l-192.020 0v-192h256v128z" - ], - "attrs": [ - { - "fill": "rgb(0, 161, 75)" - } - ], - "grid": 0, - "tags": [ - "icon-tabular-realtime-v2" - ], - "colorPermutations": { - "16161751": [], - "11617516161751": [ - 1 - ] - }, - "defaultCode": 58912, - "id": 3 - }, - { - "paths": [ - "M832 752c0 44-36 80-80 80h-480c-44 0-80-36-80-80v-480c0-44 36-80 80-80h480c44 0 80 36 80 80v480z" - ], - "grid": 0, - "tags": [ - "icon-bullet" - ], - "defaultCode": 58905, - "id": 4, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M635.6 524.4c6.6 4.2 13.2 8.6 19.2 13.6l120.4 96.4c29.6 23.8 83.8 23.8 113.4 0l135.2-108c0.2-4.8 0.2-9.4 0.2-14.2 0-52.2-7.8-102.4-22.2-149.8l-154.8 123.6c-58.2 46.6-140.2 59.2-211.4 38.4z", - "M248.6 634.2l120.4-96.4c58-46.4 140-59.2 211.2-38.4-6.6-4.2-13.2-8.6-19.2-13.6l-120.4-96.4c-29.6-23.8-83.8-23.8-113.4 0l-120.2 96.6c-40 32-91.4 48-143 48-21.6 0-43-2.8-63.8-8.4 0 0.6 0 1.2 0 1.6 5 3.4 10 6.8 14.6 10.6l120.4 96.4c29.8 23.8 83.8 23.8 113.4 0z", - "M120.6 378.2l120.4-96.4c80.2-64.2 205.6-64.2 285.8 0l120.4 96.4c29.6 23.8 83.8 23.8 113.4 0l181-144.8c-91.2-140.4-249.6-233.4-429.6-233.4-238.6 0-439.2 163.2-496 384.2 30.8 17.6 77.8 15.6 104.6-6z", - "M689 742l-120.4-96.4c-29.6-23.8-83.8-23.8-113.4 0l-120.2 96.4c-40 32-91.4 48-143 48-47.8 0-95.4-13.8-134.2-41.4 85.6 163.6 256.8 275.4 454.2 275.4s368.6-111.8 454.2-275.4c-80.4 57.4-199.8 55.2-277.2-6.6z" - ], - "attrs": [ - { - "fill": "rgb(6, 161, 75)" - }, - { - "fill": "rgb(6, 161, 75)" - }, - { - "fill": "rgb(6, 161, 75)" - }, - { - "fill": "rgb(6, 161, 75)" - } - ], - "grid": 0, - "tags": [ - "icon-session" - ], - "colorPermutations": { - "16161751": [ - 1, - 1, - 1, - 1 - ], - "11617516161751": [ - 2, - 2, - 2, - 2 - ] - }, - "defaultCode": 58904, - "id": 5 - }, - { - "paths": [ - "M454.36 476.64l86.3-86.3c9.088-8.965 21.577-14.502 35.36-14.502s26.272 5.537 35.366 14.507l86.294 86.294c19.328 19.358 42.832 34.541 69.047 44.082l1.313-171.722-57.64-57.64c-34.407-34.33-81.9-55.558-134.35-55.558s-99.943 21.228-134.354 55.562l-86.296 86.297c-9.088 8.965-21.577 14.502-35.36 14.502s-26.272-5.537-35.366-14.507l-28.674-28.654v172.14c19.045 7.022 41.040 11.084 63.984 11.084 52.463 0 99.966-21.239 134.379-55.587z", - "M505.64 547.36l-86.3 86.3c-9.088 8.965-21.577 14.502-35.36 14.502s-26.272-5.537-35.366-14.507l-86.294-86.294c-2-2-4.2-4-6.36-6v197.36c33.664 30.72 78.65 49.537 128.031 49.537 52.44 0 99.923-21.22 134.333-55.541l86.296-86.296c9.088-8.965 21.577-14.502 35.36-14.502s26.272 5.537 35.366 14.507l86.294 86.294c2 2 4.2 4 6.36 6v-197.36c-33.664-30.72-78.65-49.537-128.031-49.537-52.44 0-99.923 21.22-134.333 55.541z", - "M832 0h-128v192h127.66l0.34 0.34v639.32l-0.34 0.34h-127.66v192h128c105.6 0 192-86.4 192-192v-640c0-105.6-86.4-192-192-192z", - "M320 832h-127.66l-0.34-0.34v-639.32l0.34-0.34h127.66v-192h-128c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h128v-192z" - ], - "grid": 0, - "tags": [ - "icon-topic" - ], - "defaultCode": 58903, - "id": 6, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "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)" - } - ], - "grid": 0, - "tags": [ - "icon-eye-open-no-gleam" - ], - "colorPermutations": { - "16161751": [ - 1, - 1 - ], - "125525525516161751": [ - 1, - 1 - ], - "11617516161751": [ - 2, - 2 - ] - }, - "defaultCode": 58902, - "id": 7 - }, - { - "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)" - } - ], - "grid": 0, - "tags": [ - "icon-crosshair" - ], - "colorPermutations": { - "16161751": [ - 1, - 1 - ], - "125525525516161751": [ - 1, - 1 - ], - "11617516161751": [ - 2, - 2 - ] - }, - "defaultCode": 58901, - "id": 8 - }, - { - "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)" - } - ], - "grid": 0, - "tags": [ - "icon-collapse-pane-left" - ], - "colorPermutations": { - "16161751": [ - 0, - 0 - ], - "125525525516161751": [ - 0, - 0 - ], - "11617516161751": [ - 0, - 0 - ] - }, - "defaultCode": 58899, - "id": 9 - }, - { - "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)" - } - ], - "grid": 0, - "tags": [ - "icon-collapse-pane-right" - ], - "colorPermutations": { - "16161751": [ - 0, - 0 - ], - "125525525516161751": [ - 0, - 0 - ], - "11617516161751": [ - 0, - 0 - ] - }, - "defaultCode": 58900, - "id": 10 - }, - { - "paths": [ - "M192.2 576c-0.2 0-0.2 0 0 0l-0.2 448h640v-447.8c0 0 0 0-0.2-0.2h-639.6z", - "M978.8 210.8l-165.4-165.4c-25-25-74.2-45.4-109.4-45.4h-576c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128v-448c0-35.2 28.8-64 64-64h640c35.2 0 64 28.8 64 64v448c70.4 0 128-57.6 128-128v-576c0-35.2-20.4-84.4-45.2-109.2zM704 256c0 35.2-28.8 64-64 64h-448c-35.2 0-64-28.8-64-64v-192h320v192h128v-192h128v192z" - ], - "attrs": [ - { - "fill": "rgb(0, 0, 0)" - }, - { - "fill": "rgb(0, 0, 0)" - } - ], - "grid": 0, - "tags": [ - "icon-save-v2" - ], - "colorPermutations": { - "16161751": [ - 0, - 0 - ], - "125525525516161751": [ - 0, - 0 - ], - "11617516161751": [ - 0, - 0 - ] - }, - "defaultCode": 58898, - "id": 11 - }, - { - "paths": [ - "M896 192h-320c-16.4-16.4-96.8-96.8-109.2-109.2l-37.4-37.4c-25-25-74.2-45.4-109.4-45.4h-256c-35.2 0-64 28.8-64 64v384c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v-128c0-70.4-57.6-128-128-128z", - "M896 448h-768c-70.4 0-128 57.6-128 128v320c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-320c0-70.4-57.6-128-128-128zM320 896h-128v-320h128v320zM576 896h-128v-320h128v320zM832 896h-128v-320h128v320z" - ], - "grid": 0, - "tags": [ - "icon-dataset" - ], - "defaultCode": 58897, - "id": 12, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M512 1024c106 0 192-86 192-192h-384c0 106 86 192 192 192z", - "M896 448v-64c0-212-172-384-384-384s-384 172-384 384v64c0 70.6-57.4 128-128 128v128h1024v-128c-70.6 0-128-57.4-128-128z" - ], - "attrs": [ - { - "fill": "rgb(6, 161, 75)" - }, - { - "fill": "rgb(6, 161, 75)" - } - ], - "grid": 0, - "tags": [ - "icon-bell" - ], - "colorPermutations": { - "16161751": [ - 1, - 1 - ], - "125525525516161751": [ - 1, - 1 - ], - "11617516161751": [ - 2, - 2 - ] - }, - "defaultCode": 58896, - "id": 13 - }, - { - "paths": [ - "M1024 0h-1024c0 282.8 229.2 512 512 512s512-229.2 512-512zM512 384c-102.6 0-199-40-271.6-112.4-41.2-41.2-72-90.2-90.8-143.6h724.6c-18.8 53.4-49.6 102.4-90.8 143.6-72.4 72.4-168.8 112.4-271.4 112.4z", - "M512 512c-282.8 0-512 229.2-512 512h1024c0-282.8-229.2-512-512-512z" - ], - "attrs": [ - { - "fill": "rgb(6, 161, 75)" - }, - { - "fill": "rgb(6, 161, 75)" - } - ], - "grid": 0, - "tags": [ - "icon-hourglass" - ], - "colorPermutations": { - "16161751": [ - 1, - 1 - ], - "125525525516161751": [ - 1, - 1 - ], - "11617516161751": [ - 2, - 2 - ] - }, - "defaultCode": 58889, - "id": 14 - }, - { - "paths": [ - "M512 0c-282.8 0-512 229.2-512 512s229.2 512 512 512 512-229.2 512-512-229.2-512-512-512zM512 128c70.6 0 128 57.4 128 128s-57.4 128-128 128c-70.6 0-128-57.4-128-128s57.4-128 128-128zM704 832h-384v-128h64v-256h256v256h64v128z" - ], - "attrs": [ - { - "fill": "rgb(0, 0, 0)" - } - ], - "grid": 0, - "tags": [ - "icon-info-v1.5" - ], - "colorPermutations": { - "16161751": [ - 0 - ], - "125525525516161751": [ - 0 - ], - "11617516161751": [ - 0 - ] - }, - "defaultCode": 58888, - "id": 15 - }, - { - "paths": [ - "M512 0c-282.8 0-512 229.2-512 512s229.2 512 512 512 512-229.2 512-512-229.2-512-512-512zM832 704l-128 128-192-192-192 192-128-128 192-192-192-192 128-128 192 192 192-192 128 128-192 192 192 192z" - ], - "grid": 0, - "tags": [ - "icon-x-in-circle" - ], - "defaultCode": 58887, - "id": 16, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1024 192c0 106.039-229.23 192-512 192s-512-85.961-512-192c0-106.039 229.23-192 512-192s512 85.961 512 192z", - "M512 512c-282.8 0-512-86-512-192v512c0 106 229.2 192 512 192s512-86 512-192v-512c0 106-229.2 192-512 192zM896 575v256c-36.6 15.6-79.8 28.8-128 39.4v-256c48.2-10.6 91.4-23.8 128-39.4zM256 614.4v256c-48.2-10.4-91.4-23.8-128-39.4v-256c36.6 15.6 79.8 28.8 128 39.4zM384 890v-256c41 4 83.8 6 128 6s87-2.2 128-6v256c-41 4-83.8 6-128 6s-87-2.2-128-6z" - ], - "attrs": [ - { - "fill": "rgb(6,161,75)", - "opacity": 1 - }, - { - "fill": "rgb(6,161,75)", - "opacity": 1 - } - ], - "grid": 0, - "tags": [ - "icon-datatable" - ], - "colorPermutations": { - "16161751": [ - 1, - 1 - ], - "125525525516161751": [ - 1, - 1 - ], - "11617516161751": [ - 2, - 2 - ] - }, - "defaultCode": 58881, - "id": 17 - }, - { - "paths": [ - "M64 0c-35.2 0-64 28.8-64 64v192h448v-256h-384z", - "M1024 256v-192c0-35.2-28.8-64-64-64h-384v256h448z", - "M0 384v192c0 35.2 28.8 64 64 64h384v-256h-448z", - "M960 640c35.2 0 64-28.8 64-64v-192h-448v256h384z", - "M512 1024l-256-256h512z" - ], - "attrs": [ - { - "fill": "rgb(6,161,75)", - "opacity": 1 - }, - { - "fill": "rgb(6,161,75)", - "opacity": 1 - }, - { - "fill": "rgb(6,161,75)", - "opacity": 1 - }, - { - "fill": "rgb(6,161,75)", - "opacity": 1 - }, - { - "fill": "rgb(6,161,75)", - "opacity": 1 - } - ], - "grid": 0, - "tags": [ - "icon-tabular-scrolling" - ], - "colorPermutations": { - "16161751": [ - 1, - 1, - 1, - 1, - 1 - ], - "125525525516161751": [ - 1, - 1, - 1, - 1, - 1 - ], - "11617516161751": [ - 2, - 2, - 2, - 2, - 2 - ] - }, - "defaultCode": 58882, - "id": 18 - }, - { - "paths": [ - "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM640 448h-256v-192h256v192zM384 512h256v192h-256v-192zM320 704h-256v-192h256v192zM320 256v192h-256v-192h256zM128 960c-17 0-33-6.6-45.2-18.8s-18.8-28.2-18.8-45.2v-128h256v192h-192zM384 960v-192h256v192h-256zM960 896c0 17-6.6 33-18.8 45.2s-28.2 18.8-45.2 18.8h-192v-192h256v128zM960 704h-256v-192h256v192zM960 448h-256v-192h256v192z" - ], - "attrs": [ - { - "fill": "rgb(6, 161, 75)" - } - ], - "grid": 0, - "tags": [ - "icon-tabular" - ], - "colorPermutations": { - "16161751": [ - 1 - ], - "11617516161751": [ - 2 - ] - }, - "defaultCode": 58884, - "id": 19 - }, - { - "paths": [ - "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM640 448h-256v-192h256v192zM384 512h256v192h-256v-192zM320 704h-256v-192h256v192zM320 256v192h-256v-192h256zM128 960c-17 0-33-6.6-45.2-18.8s-18.8-28.2-18.8-45.2v-128h256v192h-192zM384 960v-192h256v192h-256zM960 896c0 17-6.6 33-18.8 45.2s-28.2 18.8-45.2 18.8h-192v-192h256v128zM960 704h-256v-192h256v192zM960 448h-256v-192h256v192z" - ], - "attrs": [ - { - "fill": "rgb(6,161,75)", - "opacity": 1 - } - ], - "grid": 0, - "tags": [ - "icon-calendar" - ], - "colorPermutations": { - "16161751": [ - 1 - ], - "125525525516161751": [ - 1 - ], - "11617516161751": [ - 2 - ] - }, - "defaultCode": 58885, - "id": 20 - }, - { - "paths": [ - "M544 224v224c0 88.4-71.6 160-160 160s-160-71.6-160-160v-97.2l-197.4 196.4c-50 50-12.4 215.2 112.4 340s290 162.4 340 112.4l417-423.6-352-352z", - "M896 1024c70.6 0 128-57.4 128-128 0-108.6-128-192-128-192s-128 83.4-128 192c0 70.6 57.4 128 128 128z", - "M384 512c-35.4 0-64-28.6-64-64v-384c0-35.4 28.6-64 64-64s64 28.6 64 64v384c0 35.4-28.6 64-64 64z" - ], - "attrs": [ - { - "fill": "rgb(6, 161, 75)" - }, - { - "fill": "rgb(6, 161, 75)" - }, - { - "fill": "rgb(6, 161, 75)" - } - ], - "grid": 0, - "tags": [ - "icon-paint-bucket" - ], - "colorPermutations": { - "16161751": [ - 1, - 1, - 1 - ], - "125525525516161751": [ - 1, - 1, - 1 - ], - "11617516161751": [ - 2, - 2, - 2 - ] - }, - "defaultCode": 58886, - "id": 21 - }, - { - "paths": [ - "M510 1024l-256-512 256-512h-256l-256 512 256 512z" - ], - "width": 512, - "grid": 0, - "tags": [ - "icon-pointer-left" - ], - "defaultCode": 123, - "id": 22, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M-2 0l256 512-256 512h256l256-512-256-512z" - ], - "width": 512, - "grid": 0, - "tags": [ - "icon-pointer-right" - ], - "defaultCode": 125, - "id": 23, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M768 256c0 105.6-86.4 192-192 192h-128c-105.6 0-192-86.4-192-192v-64c0-105.6 86.4-192 192-192h128c105.6 0 192 86.4 192 192v64z", - "M64 1024v-192c0-140.8 115.2-256 256-256h384c140.8 0 256 115.2 256 256v192z" - ], - "grid": 0, - "tags": [ - "icon-person" - ], - "defaultCode": 80, - "id": 24, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M958.4 65.6c-43.8-43.8-101-65.6-158.4-65.6s-114.6 21.8-158.4 65.6l-128 128c-74 74-85.4 187-34 273l-12.8 12.8c-35.4-20.8-75-31.4-114.8-31.4-57.4 0-114.6 21.8-158.4 65.6l-128 128c-87.4 87.4-87.4 229.4 0 316.8 43.8 43.8 101 65.6 158.4 65.6s114.6-21.8 158.4-65.6l128-128c74-74 85.4-187 34-273l12.8-12.8c35.2 21 75 31.6 114.6 31.6 57.4 0 114.6-21.8 158.4-65.6l128-128c87.6-87.6 87.6-229.6 0.2-317zM419.8 739.8l-128 128c-18 18.2-42.2 28.2-67.8 28.2s-49.8-10-67.8-28.2c-37.4-37.4-37.4-98.4 0-135.8l128-128c18.2-18.2 42.2-28.2 67.8-28.2 5.6 0 11.2 0.6 16.8 1.4l-55.6 55.6c-10.4 10.4-16.2 24.2-16.2 38.8s5.8 28.6 16.2 38.8c10.4 10.4 24.2 16.2 38.8 16.2s28.6-5.8 38.8-16.2l55.6-55.6c5.4 30.4-3.6 62.2-26.6 85zM867.8 291.8l-128 128c-18 18.2-42.2 28.2-67.8 28.2-5.6 0-11.2-0.6-16.8-1.4l55.6-55.6c10.4-10.4 16.2-24.2 16.2-38.8s-5.8-28.6-16.2-38.8c-10.4-10.4-24.2-16.2-38.8-16.2s-28.6 5.8-38.8 16.2l-55.6 55.6c-5.2-29.8 3.6-61.6 26.6-84.6l128-128c18-18.4 42.2-28.4 67.8-28.4s49.8 10 67.8 28.2c37.6 37.4 37.6 98.2 0 135.6z" - ], - "grid": 0, - "tags": [ - "icon-chain-links" - ], - "defaultCode": 232, - "id": 25, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M768 352c0 53.019-114.615 96-256 96s-256-42.981-256-96c0-53.019 114.615-96 256-96s256 42.981 256 96z", - "M768 672v-256c0 53-114.6 96-256 96s-256-43-256-96v256c0 53 114.6 96 256 96s256-43 256-96z", - "M832 0h-128v192h127.6c0.2 0 0.2 0.2 0.4 0.4v639.4c0 0.2-0.2 0.2-0.4 0.4h-127.6v192h128c105.6 0 192-86.4 192-192v-640.2c0-105.6-86.4-192-192-192z", - "M192 831.6v-639.4c0-0.2 0.2-0.2 0.4-0.4h127.6v-191.8h-128c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h128v-192h-127.6c-0.2 0-0.4-0.2-0.4-0.4z" - ], - "grid": 0, - "tags": [ - "icon-database-in-brackets" - ], - "defaultCode": 115, - "id": 26, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1012.8 414.2v-391.6l-127.6 127.4c-96.6-96.8-225.2-150-362-150s-265.2 53.2-362 150c-96.8 96.8-150 225.2-150 362s53.2 265.4 150 362c96.8 96.8 225.2 150 362 150s265.4-53.2 362-150l-136.6-136.6c-124.2 124.2-326.4 124.2-450.8 0-124.2-124.2-124.2-326.4 0-450.8 124.2-124.2 326.4-124.2 450.8 0l-127.4 127.4h391.6z" - ], - "grid": 0, - "tags": [ - "icon-refresh" - ], - "defaultCode": 114, - "id": 27, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M832 384h-32v-96c0-158.8-129.2-288-288-288s-288 129.2-288 288v96h-32c-70.4 0-128 57.6-128 128v384c0 70.4 57.6 128 128 128h640c70.4 0 128-57.6 128-128v-384c0-70.4-57.6-128-128-128zM416 288c0-53 43-96 96-96s96 43 96 96v96h-192v-96z" - ], - "grid": 0, - "tags": [ - "icon-lock" - ], - "defaultCode": 108, - "id": 28, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M640 256h-256c-70.4 0-128 57.6-128 128v256c0 70.4 57.6 128 128 128h256c70.4 0 128-57.6 128-128v-256c0-70.4-57.6-128-128-128z", - "M0 0h192v192h-192v-192z", - "M256 0h192v128h-192v-128z", - "M576 0h192v128h-192v-128z", - "M256 896h192v128h-192v-128z", - "M576 896h192v128h-192v-128z", - "M0 576h128v192h-128v-192z", - "M0 256h128v192h-128v-192z", - "M896 576h128v192h-128v-192z", - "M896 256h128v192h-128v-192z", - "M832 0h192v192h-192v-192z", - "M0 832h192v192h-192v-192z", - "M832 832h192v192h-192v-192z" - ], - "grid": 0, - "tags": [ - "icon-box-with-dashed-lines" - ], - "defaultCode": 51, - "id": 29, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M894-2h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h400c-2.2-3.8-4-7.6-5.8-11.4l-255.2-576.8c-21.4-48.4-10.8-105 26.6-142.4 24.4-24.4 57.2-37.4 90.4-37.4 17.4 0 35.2 3.6 51.8 11l576.6 255.4c4 1.8 7.8 3.8 11.4 5.8v-400.2c0.2-70.4-57.4-128-127.8-128z", - "M958.6 637.4l-576.6-255.4 255.4 576.6 64.6-128.6 192 192 128-128-192-192z" - ], - "attrs": [ - { - "fill": "rgb(0, 0, 0)" - }, - { - "fill": "rgb(0, 0, 0)" - } - ], - "grid": 0, - "tags": [ - "icon-box-with-arrow-cursor" - ], - "colorPermutations": { - "16161751": [ - 0, - 0 - ], - "125525525516161751": [ - 0, - 0 - ], - "11617516161751": [ - 0, - 0 - ] - }, - "defaultCode": 58880, - "id": 30 - }, - { - "paths": [ - "M512 0c-214.866 0-398.786 132.372-474.744 320h90.744c56.86 0 107.938 24.724 143.094 64h240.906l-192-192h256l320 320-320 320h-256l192-192h-240.906c-35.156 39.276-86.234 64-143.094 64h-90.744c75.958 187.628 259.878 320 474.744 320 282.77 0 512-229.23 512-512s-229.23-512-512-512z" - ], - "grid": 0, - "tags": [ - "icon-activity-mode" - ], - "defaultCode": 65, - "id": 31, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M576 64h-256l320 320h-290.256c-44.264-76.516-126.99-128-221.744-128h-128v512h128c94.754 0 177.48-51.484 221.744-128h290.256l-320 320h256l448-448-448-448z" - ], - "grid": 0, - "tags": [ - "icon-activity" - ], - "defaultCode": 97, - "id": 32, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M832 0h-640c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-640c0-105.6-86.4-192-192-192zM640 832c0 35.2-28.8 64-64 64h-128c-35.2 0-64-28.8-64-64v-64c0-35.2 28.8-64 64-64h128c35.2 0 64 28.8 64 64v64zM696.062 191.506l-48.124 384.988c-4.366 34.928-36.738 63.506-71.938 63.506h-128c-35.2 0-67.572-28.578-71.938-63.506l-48.124-384.988c-4.366-34.928 20.862-63.506 56.062-63.506h256c35.2 0 60.428 28.578 56.062 63.506z" - ], - "grid": 0, - "tags": [ - "icon-alert-rect" - ], - "defaultCode": 33, - "id": 33, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M998.208 848.864l-422.702-739.728c-34.928-61.124-92.084-61.124-127.012 0l-422.702 739.728c-34.928 61.126-5.906 111.136 64.494 111.136h843.428c70.4 0 99.422-50.010 64.494-111.136zM512 832c-35.2 0-64-28.8-64-64s28.8-64 64-64 64 28.8 64 64c0 35.2-28.8 64-64 64zM627.448 382.758l-38.898 194.486c-6.902 34.516-41.35 62.756-76.55 62.756s-69.648-28.24-76.552-62.758l-38.898-194.486c-6.902-34.516 16.25-62.756 51.45-62.756h128c35.2 0 58.352 28.24 51.448 62.758z" - ], - "grid": 0, - "tags": [ - "icon-alert-triangle" - ], - "defaultCode": 58883, - "id": 34, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M510 510l-512-512h1024z", - "M510 1022l-512-512h1024z" - ], - "grid": 0, - "tags": [ - "icon-arrow-double-down" - ], - "defaultCode": 238, - "id": 35, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M510 510l512 512h-1024z", - "M510-2l512 512h-1024z" - ], - "grid": 0, - "tags": [ - "icon-arrow-double-up" - ], - "defaultCode": 235, - "id": 36, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M512 768l512-512h-1024z" - ], - "grid": 0, - "tags": [ - "icon-arrow-down" - ], - "defaultCode": 118, - "id": 37, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M256 512l512 512v-1024z" - ], - "grid": 0, - "tags": [ - "icon-arrow-left" - ], - "defaultCode": 60, - "id": 38, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M768 512l-512-512v1024z" - ], - "grid": 0, - "tags": [ - "icon-arrow-right" - ], - "defaultCode": 62, - "id": 39, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M512 1024l-512-1024h1024z" - ], - "grid": 0, - "tags": [ - "icon-arrow-tall-down" - ], - "defaultCode": 236, - "id": 40, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M512 0l512 1024h-1024z" - ], - "grid": 0, - "tags": [ - "icon-arrow-tall-up" - ], - "defaultCode": 237, - "id": 41, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M512 256l-512 512h1024z" - ], - "grid": 0, - "tags": [ - "icon-arrow-up" - ], - "defaultCode": 94, - "id": 42, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M0 512l256 256v-512z", - "M512 0l-256 256h512z", - "M512 1024l256-256h-512z", - "M768 256v512l256-256z" - ], - "grid": 0, - "tags": [ - "icon-arrows-out" - ], - "defaultCode": 73, - "id": 43, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1024 512l-448 512v-1024z", - "M448 0l-448 512 448 512z" - ], - "grid": 0, - "tags": [ - "icon-arrows-right-left" - ], - "defaultCode": 58893, - "id": 44, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M512 0l512 448h-1024z", - "M0 576l512 448 512-448z" - ], - "grid": 0, - "tags": [ - "icon-arrows-up-down" - ], - "defaultCode": 53, - "id": 45, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1004.166 340.458l-97.522-168.916-330.534 229.414 33.414-400.956h-195.048l33.414 400.956-330.534-229.414-97.522 168.916 363.944 171.542-363.944 171.542 97.522 168.916 330.534-229.414-33.414 400.956h195.048l-33.414-400.956 330.534 229.414 97.522-168.916-363.944-171.542z" - ], - "grid": 0, - "tags": [ - "icon-asterisk" - ], - "defaultCode": 42, - "id": 46, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M192 0c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h64v-1024h-64z", - "M384 0h256v1024h-256v-1024z", - "M832 0h-64v704h256v-512c0-105.6-86.4-192-192-192z" - ], - "grid": 0, - "tags": [ - "icon-autoflow-tabular" - ], - "defaultCode": 72, - "id": 47, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M0 0h1024v1024h-1024v-1024z" - ], - "attrs": [ - { - "fill": "rgb(0, 0, 0)" - } - ], - "grid": 0, - "tags": [ - "icon-box-round-corners" - ], - "colorPermutations": { - "16161751": [ - 0 - ], - "125525525516161751": [ - 0 - ], - "11617516161751": [ - 0 - ] - }, - "defaultCode": 224, - "id": 48 - }, - { - "paths": [ - "M1024 0l-640 640-384-384v384l384 384 640-640z" - ], - "grid": 0, - "tags": [ - "icon-check" - ], - "defaultCode": 50, - "id": 49, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M512 0c-282.77 0-512 229.23-512 512s229.23 512 512 512 512-229.23 512-512-229.23-512-512-512zM768 576h-256c-35.2 0-64-28.8-64-64v-384c0-35.2 28.8-64 64-64s64 28.8 64 64v320h192c35.2 0 64 28.8 64 64s-28.8 64-64 64z" - ], - "grid": 0, - "tags": [ - "icon-clock" - ], - "defaultCode": 67, - "id": 50, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M704 576c0 70.4-57.6 128-128 128h-128c-70.4 0-128-57.6-128-128v-128c0-70.4 57.6-128 128-128h128c70.4 0 128 57.6 128 128v128z", - "M1024 512l-192-320v640z", - "M0 512l192-320v640z" - ], - "grid": 0, - "tags": [ - "icon-connectivity" - ], - "defaultCode": 46, - "id": 51, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M683.52 819.286c-50.782 28.456-109.284 44.714-171.52 44.714-194.094 0-352-157.906-352-352s157.906-352 352-352 352 157.906 352 352c0 62.236-16.258 120.738-44.714 171.52l191.692 191.692c8.516-13.89 13.022-28.354 13.022-43.212v-640c0-106.038-229.23-192-512-192s-512 85.962-512 192v640c0 106.038 229.23 192 512 192 126.11 0 241.548-17.108 330.776-45.46l-159.256-159.254z", - "M352 512c0 88.224 71.776 160 160 160s160-71.776 160-160-71.776-160-160-160-160 71.776-160 160z" - ], - "grid": 0, - "tags": [ - "icon-database-query" - ], - "defaultCode": 100, - "id": 52, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1024 192c0 106.039-229.23 192-512 192s-512-85.961-512-192c0-106.039 229.23-192 512-192s512 85.961 512 192z", - "M512 512c-282.77 0-512-85.962-512-192v512c0 106.038 229.23 192 512 192s512-85.962 512-192v-512c0 106.038-229.23 192-512 192z" - ], - "grid": 0, - "tags": [ - "icon-database" - ], - "defaultCode": 68, - "id": 53, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M832 640c105.6 0 192-86.4 192-192v-256c0-105.6-86.4-192-192-192v320l-128-64-128 64v-320h-384c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-192c0 105.6-86.4 192-192 192h-640v-192h640z" - ], - "grid": 0, - "tags": [ - "icon-dictionary" - ], - "defaultCode": 81, - "id": 54, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M640 256v-128c0-70.4-57.6-128-128-128h-384c-70.4 0-128 57.6-128 128v384c0 70.4 57.6 128 128 128h128v-139.6c0-134.8 109.6-244.4 244.4-244.4h139.6z", - "M896 384h-384c-70.4 0-128 57.6-128 128v384c0 70.4 57.6 128 128 128h384c70.4 0 128-57.6 128-128v-384c0-70.4-57.6-128-128-128z" - ], - "grid": 0, - "tags": [ - "icon-duplicate" - ], - "defaultCode": 242, - "id": 55, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M896 192h-320c-16.4-16.4-96.8-96.8-109.2-109.2l-37.4-37.4c-25-25-74.2-45.4-109.4-45.4h-256c-35.2 0-64 28.8-64 64v384c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v-128c0-70.4-57.6-128-128-128z", - "M896 448h-768c-70.4 0-128 57.6-128 128v320c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-320c0-70.4-57.6-128-128-128zM704 800h-128v128h-128v-128h-128v-128h128v-128h128v128h128v128z" - ], - "grid": 0, - "tags": [ - "icon-folder-new" - ], - "defaultCode": 102, - "id": 56, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M896 192h-320c-16.4-16.4-96.8-96.8-109.2-109.2l-37.4-37.4c-25-25-74.2-45.4-109.4-45.4h-256c-35.2 0-64 28.8-64 64v384c0-70.4 57.6-128 128-128h768c70.4 0 128 57.6 128 128v-128c0-70.4-57.6-128-128-128z", - "M896 448h-768c-70.4 0-128 57.6-128 128v320c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-320c0-70.4-57.6-128-128-128z" - ], - "grid": 0, - "tags": [ - "icon-folder" - ], - "defaultCode": 70, - "id": 57, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M191.656 832c0.118 0.1 0.244 0.224 0.344 0.344v191.656h192v-192c0-105.6-86.4-192-192-192h-192v192h191.656z", - "M192 191.656c-0.1 0.118-0.224 0.244-0.344 0.344h-191.656v192h192c105.6 0 192-86.4 192-192v-192h-192v191.656z", - "M832 384h192v-192h-191.656c-0.118-0.1-0.244-0.226-0.344-0.344v-191.656h-192v192c0 105.6 86.4 192 192 192z", - "M832 832.344c0.1-0.118 0.224-0.244 0.344-0.344h191.656v-192h-192c-105.6 0-192 86.4-192 192v192h192v-191.656z" - ], - "grid": 0, - "tags": [ - "icon-fullscreen-collapse" - ], - "defaultCode": 95, - "id": 58, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M192.344 832c-0.118-0.1-0.244-0.224-0.344-0.344v-191.656h-192v192c0 105.6 86.4 192 192 192h192v-192h-191.656z", - "M192 192.344c0.1-0.118 0.224-0.244 0.344-0.344h191.656v-192h-192c-105.6 0-192 86.4-192 192v192h192v-191.656z", - "M832 0h-192v192h191.656c0.118 0.1 0.244 0.226 0.344 0.344v191.656h192v-192c0-105.6-86.4-192-192-192z", - "M832 831.656c-0.1 0.118-0.224 0.244-0.344 0.344h-191.656v192h192c105.6 0 192-86.4 192-192v-192h-192v191.656z" - ], - "grid": 0, - "tags": [ - "icon-fullscreen-expand" - ], - "defaultCode": 122, - "id": 59, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1024 576v-128l-140.976-35.244c-8.784-32.922-21.818-64.106-38.504-92.918l74.774-124.622-90.51-90.51-124.622 74.774c-28.812-16.686-59.996-29.72-92.918-38.504l-35.244-140.976h-128l-35.244 140.976c-32.922 8.784-64.106 21.818-92.918 38.504l-124.622-74.774-90.51 90.51 74.774 124.622c-16.686 28.812-29.72 59.996-38.504 92.918l-140.976 35.244v128l140.976 35.244c8.784 32.922 21.818 64.106 38.504 92.918l-74.774 124.622 90.51 90.51 124.622-74.774c28.812 16.686 59.996 29.72 92.918 38.504l35.244 140.976h128l35.244-140.976c32.922-8.784 64.106-21.818 92.918-38.504l124.622 74.774 90.51-90.51-74.774-124.622c16.686-28.812 29.72-59.996 38.504-92.918l140.976-35.244zM704 512c0 106.038-85.962 192-192 192s-192-85.962-192-192 85.962-192 192-192 192 85.962 192 192z" - ], - "grid": 0, - "tags": [ - "icon-gear" - ], - "defaultCode": 71, - "id": 60, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM896 896h-768v-768h768v768z", - "M320 256l-128 128v448h640v-320l-128-128-128 128z" - ], - "grid": 0, - "tags": [ - "icon-image" - ], - "defaultCode": 227, - "id": 61, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1024 384l-512-384-512 384 512 384z", - "M512 896l-426.666-320-85.334 64 512 384 512-384-85.334-64z" - ], - "grid": 0, - "tags": [ - "icon-layers" - ], - "defaultCode": 225, - "id": 62, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M448 0h-256c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h256v-1024z", - "M832 0h-256v577.664h448v-385.664c0-105.6-86.4-192-192-192z", - "M576 1024h256c105.6 0 192-86.4 192-192v-129.664h-448v321.664z" - ], - "grid": 0, - "tags": [ - "icon-layout" - ], - "defaultCode": 76, - "id": 63, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M64 576c-35.346 0-64-28.654-64-64s28.654-64 64-64h896c35.346 0 64 28.654 64 64s-28.654 64-64 64h-896z" - ], - "grid": 0, - "tags": [ - "icon-line-horz" - ], - "defaultCode": 226, - "id": 64, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1024 512l-512-512v307.2l-512 204.8v256h512v256z" - ], - "grid": 0, - "tags": [ - "icon-link" - ], - "defaultCode": 244, - "id": 65, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M640 384h-128v-128h-128v128h-128v128h128v128h128v-128h128z", - "M1024 896l-201.662-201.662c47.922-72.498 73.662-157.434 73.662-246.338 0-119.666-46.6-232.168-131.216-316.784s-197.118-131.216-316.784-131.216c-119.666 0-232.168 46.6-316.784 131.216s-131.216 197.118-131.216 316.784c0 119.666 46.6 232.168 131.216 316.784s197.118 131.216 316.784 131.216c88.904 0 173.84-25.74 246.338-73.662l201.662 201.662 128-128zM448 704c-141.16 0-256-114.842-256-256 0-141.16 114.84-256 256-256 141.158 0 256 114.84 256 256 0 141.158-114.842 256-256 256z" - ], - "grid": 0, - "tags": [ - "icon-magnify-in" - ], - "defaultCode": 88, - "id": 66, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M256 384h384v128h-384v-128z", - "M1024 896l-201.662-201.662c47.922-72.498 73.662-157.434 73.662-246.338 0-119.666-46.6-232.168-131.216-316.784s-197.118-131.216-316.784-131.216c-119.666 0-232.168 46.6-316.784 131.216s-131.216 197.118-131.216 316.784c0 119.666 46.6 232.168 131.216 316.784s197.118 131.216 316.784 131.216c88.904 0 173.84-25.74 246.338-73.662l201.662 201.662 128-128zM448 704c-141.16 0-256-114.842-256-256 0-141.16 114.84-256 256-256 141.158 0 256 114.84 256 256 0 141.158-114.842 256-256 256z" - ], - "grid": 0, - "tags": [ - "icon-magnify-out" - ], - "defaultCode": 89, - "id": 67, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1024 896l-201.662-201.662c47.922-72.498 73.662-157.434 73.662-246.338 0-119.666-46.6-232.168-131.216-316.784s-197.118-131.216-316.784-131.216-232.168 46.6-316.784 131.216-131.216 197.118-131.216 316.784 46.6 232.168 131.216 316.784 197.118 131.216 316.784 131.216c88.904 0 173.84-25.74 246.338-73.662l201.662 201.662 128-128zM448 704c-141.16 0-256-114.842-256-256 0-141.16 114.84-256 256-256 141.158 0 256 114.84 256 256 0 141.158-114.842 256-256 256z" - ], - "grid": 0, - "tags": [ - "icon-magnify" - ], - "defaultCode": 77, - "id": 68, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M0 0h1024v256h-1024v-256z", - "M0 384h1024v256h-1024v-256z", - "M0 768h1024v256h-1024v-256z" - ], - "grid": 0, - "tags": [ - "icon-menu" - ], - "defaultCode": 109, - "id": 69, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M293.4 512l218.6-218.6 256 256v-421.4c0-70.4-57.6-128-128-128h-512c-70.4 0-128 57.6-128 128v512c0 70.4 57.6 128 128 128h421.4l-256-256z", - "M1024 448h-128v320l-384-384-128 128 384 384h-320v128h576z" - ], - "grid": 0, - "tags": [ - "icon-move" - ], - "defaultCode": 243, - "id": 70, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M448 0v128h320l-384 384 128 128 384-384v320h128v-576z", - "M576 674.274v157.382c-0.1 0.118-0.226 0.244-0.344 0.344h-383.312c-0.118-0.1-0.244-0.226-0.344-0.344v-383.312c0.1-0.118 0.226-0.244 0.344-0.344h157.382l192-192h-349.726c-105.6 0-192 86.4-192 192v384c0 105.6 86.4 192 192 192h384c105.6 0 192-86.4 192-192v-349.726l-192 192z" - ], - "grid": 0, - "tags": [ - "icon-new-window" - ], - "defaultCode": 121, - "id": 71, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M512 1024l512-320v-384l-512.020-320-511.98 320v384l512 320zM512 192l358.4 224-358.4 224-358.4-224 358.4-224z" - ], - "grid": 0, - "tags": [ - "icon-object" - ], - "defaultCode": 111, - "id": 72, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M510-2l-512 320v384l512 320 512-320v-384l-512-320zM585.4 859.2c-21.2 20.8-46 30.8-76 30.8-31.2 0-56.2-9.8-76.2-29.6-20-20-29.6-44.8-29.6-76.2 0-30.4 10.2-55.2 31-76.2s45.2-31.2 74.8-31.2c29.6 0 54.2 10.4 75.6 32s31.8 46.4 31.8 76c-0.2 29-10.8 54-31.4 74.4zM638.2 546.6c-23.6 11.8-37.4 22-43.4 32.4-3.6 6.2-6 14.8-7.4 26.8v41h-161.4v-44.2c0-40.2 4.4-69.8 13-88 8-17.2 22.6-30.2 44.8-40l34.8-15.4c32-14.2 48.2-35.2 48.2-62.8 0-16-6-30.4-17.2-41.8-11.2-11.2-25.6-17.2-41.6-17.2-24 0-54.4 10-62.8 57.4l-2.2 12.2h-147l1.4-16.2c4-44.6 17-82.4 38.8-112.2 19.6-27 45.6-48.6 77-64.6s64.6-24 98.2-24c60.6 0 110.2 19.4 151.4 59.6 41.2 40 61.2 88 61.2 147.2 0 70.8-28.8 121.4-85.8 149.8z" - ], - "grid": 0, - "tags": [ - "icon-object-unknown" - ], - "defaultCode": 63, - "id": 73, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M511.98 0l-511.98 320v512c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-512l-512.020-320zM512 192l358.4 224-358.4 224-358.4-224 358.4-224z" - ], - "grid": 0, - "tags": [ - "icon-packet" - ], - "defaultCode": 86, - "id": 74, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M702 508c-105.6 0-192-86.4-192-192v-320h-320c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-320h-320z", - "M766 380h256l-384-384v256c0 70.4 57.6 128 128 128z" - ], - "grid": 0, - "tags": [ - "icon-page" - ], - "defaultCode": 234, - "id": 75, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M126-2h256v1024h-256v-1024z", - "M638-2h256v1024h-256v-1024z" - ], - "grid": 0, - "tags": [ - "icon-pause" - ], - "defaultCode": 241, - "id": 76, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M922.344 101.68c-38.612-38.596-81.306-69.232-120.304-86.324-68.848-30.25-104.77-9.078-120.194 6.344l-516.228 516.216-3.136 9.152-162.482 476.932 485.998-165.612 6.73-6.806 509.502-509.506c9.882-9.866 21.768-27.77 21.768-56.578 0.002-50.71-38.996-121.148-101.654-183.818zM237.982 855.66l-69.73-69.728 69.25-203.228 18.498-6.704h64v128h128v64l-6.846 18.506-203.172 69.154z" - ], - "grid": 0, - "tags": [ - "icon-pencil" - ], - "defaultCode": 112, - "id": 77, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M704 320h64c70.4 0 128-57.6 128-128v-64c0-70.4-57.6-128-128-128h-64c-70.4 0-128 57.6-128 128v64c0 70.4 57.6 128 128 128z", - "M256 320h64c70.4 0 128-57.6 128-128v-64c0-70.4-57.6-128-128-128h-64c-70.4 0-128 57.6-128 128v64c0 70.4 57.6 128 128 128z", - "M832 384h-192c-34.908 0-67.716 9.448-96 25.904 57.278 33.324 96 95.404 96 166.096v448h384v-448c0-105.6-86.4-192-192-192z", - "M384 384h-192c-105.6 0-192 86.4-192 192v448h576v-448c0-105.6-86.4-192-192-192z" - ], - "grid": 0, - "tags": [ - "icon-people" - ], - "defaultCode": 79, - "id": 78, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1024 512l-1024 512v-1024z" - ], - "grid": 0, - "tags": [ - "icon-play" - ], - "defaultCode": 239, - "id": 79, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M255.884 704c0.040-0.034 0.082-0.074 0.116-0.116v-127.884c0-70.58 57.42-128 128-128h255.884c0.040-0.034 0.082-0.074 0.116-0.116v-127.884c0-70.58 57.42-128 128-128h143.658c-93.832-117.038-237.98-192-399.658-192-282.77 0-512 229.23-512 512 0 67.904 13.25 132.704 37.256 192h218.628z", - "M768.116 320c-0.040 0.034-0.082 0.074-0.116 0.116v127.884c0 70.58-57.42 128-128 128h-255.884c-0.040 0.034-0.082 0.074-0.116 0.116v127.884c0 70.58-57.42 128-128 128h-143.658c93.832 117.038 237.98 192 399.658 192 282.77 0 512-229.23 512-512 0-67.904-13.25-132.704-37.256-192h-218.628z" - ], - "grid": 0, - "tags": [ - "icon-plot-resource" - ], - "defaultCode": 233, - "id": 80, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M960 384h-330v-320c0-35.2-28.8-64-64-64h-108c-35.2 0-64 28.8-64 64v320h-330c-35.2 0-64 28.8-64 64v128c0 35.2 28.8 64 64 64h330v320c0 35.2 28.8 64 64 64h108c35.2 0 64-28.8 64-64v-320h330c35.2 0 64-28.8 64-64v-128c0-35.2-28.8-64-64-64z" - ], - "grid": 0, - "tags": [ - "icon-plus" - ], - "defaultCode": 43, - "id": 81, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M960 640c35.2 0 64-28.8 64-64v-128c0-35.2-28.8-64-64-64h-896c-35.2 0-64 28.8-64 64v128c0 35.2 28.8 64 64 64h896z" - ], - "grid": 0, - "tags": [ - "icon-minus" - ], - "defaultCode": 45, - "id": 82, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M1022.294 512c-1.746-7.196-3.476-14.452-5.186-21.786-20.036-85.992-53.302-208.976-98-306.538-22.42-48.938-45.298-86.556-69.946-115.006-48.454-55.93-98.176-67.67-131.356-67.67s-82.902 11.74-131.356 67.672c-24.648 28.45-47.528 66.068-69.948 115.006-44.696 97.558-77.962 220.544-98 306.538-21.646 92.898-46.444 175.138-71.71 237.836-16.308 40.46-30.222 66.358-40.6 82.604-10.378-16.246-24.292-42.142-40.6-82.604-23.272-57.75-46.144-132.088-66.524-216.052h-197.362c1.746 7.196 3.476 14.452 5.186 21.786 20.036 85.992 53.302 208.976 98 306.538 22.42 48.938 45.298 86.556 69.946 115.006 48.454 55.932 98.176 67.672 131.356 67.672s82.902-11.74 131.356-67.672c24.648-28.45 47.528-66.068 69.948-115.006 44.696-97.558 77.962-220.544 98-306.538 21.646-92.898 46.444-175.138 71.71-237.836 16.308-40.46 30.222-66.358 40.6-82.604 10.378 16.246 24.292 42.142 40.6 82.604 23.274 57.748 46.146 132.086 66.526 216.050h197.36z" - ], - "grid": 0, - "tags": [ - "icon-sine" - ], - "defaultCode": 54, - "id": 83, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M0 0v256h128v-64h256v704h-192v128h640v-128h-192v-704h256v64h128v-256z" - ], - "grid": 0, - "tags": [ - "icon-T" - ], - "defaultCode": 228, - "id": 84, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M169.2 448c14-56.4 33-122 56.6-176.8 15.4-35.8 31.2-63.2 48.2-84 18.4-22.4 49-49.2 91-49.2s72.6 26.8 91 49.2c17 20.6 32.6 48.2 48.2 84 23.6 54.8 42.8 120.4 56.6 176.8h461.2v-256c0-105.6-86.4-192-192-192h-640c-105.6 0-192 86.4-192 192v256h171.2z", - "M718.6 576h-127.2c25 93.4 48.4 144.4 63.6 168.6 15.2-24.2 38.6-75.2 63.6-168.6z", - "M301.4 448h127.2c-25-93.4-48.4-144.4-63.6-168.6-15.2 24.2-38.6 75.2-63.6 168.6z", - "M850.8 576c-14 56.4-33 122-56.6 176.8-15.4 35.8-31.2 63.2-48.2 84-18.4 22.4-49 49.2-91 49.2s-72.6-26.8-91-49.2c-17-20.6-32.6-48.2-48.2-84-23.6-54.8-42.8-120.4-56.6-176.8h-461.2v256c0 105.6 86.4 192 192 192h640c105.6 0 192-86.4 192-192v-256h-171.2z" - ], - "grid": 0, - "tags": [ - "icon-telemetry-panel" - ], - "defaultCode": 116, - "id": 85, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M718.6 576h-127.2c25 93.4 48.4 144.4 63.6 168.6 15.2-24.2 38.6-75.2 63.6-168.6z", - "M794.2 752.8c-15.4 35.8-31.2 63.2-48.2 84-18.4 22.4-49 49.2-91 49.2s-72.6-26.8-91-49.2c-17-20.6-32.6-48.2-48.2-84-23.6-54.8-42.8-120.4-56.6-176.8h-457.2c31.4 252.6 247 448 508 448s476.6-195.4 508-448h-167.2c-14 56.4-33 122-56.6 176.8z", - "M301.4 448h127.2c-25-93.4-48.4-144.4-63.6-168.6-15.2 24.2-38.6 75.2-63.6 168.6z", - "M274 187.2c18.4-22.4 49-49.2 91-49.2s72.6 26.8 91 49.2c17 20.6 32.6 48.2 48.2 84 23.6 54.8 42.8 120.4 56.6 176.8h457.2c-31.4-252.6-246.8-448-508-448s-476.6 195.4-508 448h167.2c14-56.4 33-122 56.6-176.8 15.6-35.8 31.4-63.2 48.2-84z" - ], - "grid": 0, - "tags": [ - "icon-telemetry" - ], - "defaultCode": 84, - "id": 86, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M448 382c0 35.2-28.8 64-64 64h-320c-35.2 0-64-28.8-64-64v-320c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v320z", - "M1024 382c0 35.2-28.8 64-64 64h-320c-35.2 0-64-28.8-64-64v-320c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v320z", - "M448 958c0 35.2-28.8 64-64 64h-320c-35.2 0-64-28.8-64-64v-320c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v320z", - "M1024 958c0 35.2-28.8 64-64 64h-320c-35.2 0-64-28.8-64-64v-320c0-35.2 28.8-64 64-64h320c35.2 0 64 28.8 64 64v320z" - ], - "grid": 0, - "tags": [ - "icon-thumbs-strip" - ], - "defaultCode": 246, - "id": 87, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M256 256h384v128h-384v-128z", - "M384 448h384v128h-384v-128z", - "M320 640h384v128h-384v-128z", - "M832 0h-128v192h127.6c0.2 0 0.2 0.2 0.4 0.4v639.4c0 0.2-0.2 0.2-0.4 0.4h-127.6v192h128c105.6 0 192-86.4 192-192v-640.2c0-105.6-86.4-192-192-192z", - "M192 831.6v-639.2c0-0.2 0.2-0.2 0.4-0.4h127.6v-192h-128c-105.6 0-192 86.4-192 192v640c0 105.6 86.4 192 192 192h128v-192h-127.6c-0.2 0-0.4-0.2-0.4-0.4z" - ], - "grid": 0, - "tags": [ - "icon-timeline" - ], - "defaultCode": 83, - "id": 88, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M638 62c0-35.4-28.6-64-64-64h-128c-35.4 0-64 28.6-64 64s28.6 64 64 64h128c35.4 0 64-28.6 64-64z", - "M510 126c-247.4 0-448 200.6-448 448s200.6 448 448 448 448-200.6 448-448-200.6-448-448-448zM510 574h-336c0-185.2 150.8-336 336-336v336z" - ], - "grid": 0, - "tags": [ - "icon-timer" - ], - "defaultCode": 245, - "id": 89, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M832 128h-192.36v-64c0-35.2-28.8-64-64-64h-128c-35.2 0-64 28.8-64 64v64h-191.64c-105.6 0-192 72-192 160s0 160 0 160h64v384c0 105.6 86.4 192 192 192h512c105.6 0 192-86.4 192-192v-384h64c0 0 0-72 0-160s-86.4-160-192-160zM320 832h-128v-384h128v384zM576 832h-128v-384h128v384zM832 832h-128v-384h128v384z" - ], - "grid": 0, - "tags": [ - "icon-trash" - ], - "defaultCode": 90, - "id": 90, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM128 128h320v768h-320v-768zM896 896h-320v-768h320v768z" - ], - "grid": 0, - "tags": [ - "icon-two-parts-both" - ], - "defaultCode": 229, - "id": 91, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M896 0h-768c-70.4 0-128 57.6-128 128v768c0 70.4 57.6 128 128 128h768c70.4 0 128-57.6 128-128v-768c0-70.4-57.6-128-128-128zM896 896h-320v-768h320v768z" - ], - "grid": 0, - "tags": [ - "icon-two-parts-one-only" - ], - "defaultCode": 231, - "id": 92, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M384 512l-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" - ], - "grid": 0, - "tags": [ - "icon-x-heavy" - ], - "defaultCode": 120, - "id": 93, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - }, - { - "paths": [ - "M384 512l-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" - ], - "grid": 0, - "tags": [ - "icon-x" - ], - "defaultCode": 58946, - "id": 94, - "attrs": [], - "colorPermutations": { - "11617516161751": [] - } - } - ], - "colorThemes": [ - [ - [ - 0, - 0, - 0, - 1 - ], - [ - 0, - 161, - 75, - 1 - ], - [ - 6, - 161, - 75, - 1 - ] - ] - ], - "colorThemeIdx": 0, - "preferences": { - "showGlyphs": true, - "showQuickUse": true, - "showQuickUse2": true, - "showSVGs": true, - "fontPref": { - "prefix": "", - "metadata": { - "fontFamily": "wtdsymbols", - "majorVersion": 2, - "minorVersion": 0 - }, - "metrics": { - "emSize": 1024, - "baseline": 6.25, - "whitespace": 50 - }, - "resetPoint": 58880, - "showVersion": true, - "showSelector": true, - "selector": "class", - "classSelector": ".ui-symbol", - "showMetrics": true, - "showMetadata": true, - "embed": false - }, - "imagePref": { - "prefix": "icon-", - "png": true, - "useClassSelector": true, - "color": 4473924, - "bgColor": 16777215, - "classSelector": ".icon" - }, - "historySize": 100, - "showCodes": true, - "gridSize": 16, - "showLiga": false - }, - "id": 1, - "invisible": false - } - ], - "preferences": { - "showGlyphs": true, - "showQuickUse": true, - "showQuickUse2": true, - "showSVGs": true, - "fontPref": { - "prefix": "", - "metadata": { - "fontFamily": "wtdsymbols", - "majorVersion": 2, - "minorVersion": 0 - }, - "metrics": { - "emSize": 1024, - "baseline": 6.25, - "whitespace": 50 - }, - "resetPoint": 58880, - "showVersion": true, - "showSelector": true, - "selector": "class", - "classSelector": ".ui-symbol", - "showMetrics": true, - "showMetadata": true, - "embed": false - }, - "imagePref": { - "prefix": "icon-", - "png": true, - "useClassSelector": true, - "color": 4473924, - "bgColor": 16777215, - "classSelector": ".icon" - }, - "historySize": 100, - "showCodes": true, - "gridSize": 16, - "showLiga": false - }, - "uid": -1 -} \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.eot b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.eot new file mode 100755 index 0000000000..399c1c56b8 Binary files /dev/null and b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.eot differ diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.svg b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.svg new file mode 100755 index 0000000000..8ebcd6c264 --- /dev/null +++ b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.svg @@ -0,0 +1,14 @@ + + + +Generated by IcoMoon + + + + + + + + + + \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.ttf b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.ttf new file mode 100755 index 0000000000..dabd0d7eac Binary files /dev/null and b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.ttf differ diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.woff b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.woff new file mode 100755 index 0000000000..714e467924 Binary files /dev/null and b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-12px.woff differ diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.eot b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.eot new file mode 100755 index 0000000000..a6b919620b Binary files /dev/null and b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.eot differ diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg new file mode 100755 index 0000000000..b0d24712fc --- /dev/null +++ b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.svg @@ -0,0 +1,106 @@ + + + +Generated by IcoMoon + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.ttf b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.ttf new file mode 100755 index 0000000000..a920e86179 Binary files /dev/null and b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.ttf differ diff --git a/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.woff b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.woff new file mode 100755 index 0000000000..1e9f1acecd Binary files /dev/null and b/platform/commonUI/general/res/fonts/symbols/openmct-symbols-16px.woff differ diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot deleted file mode 100755 index ac6f815eed..0000000000 Binary files a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot and /dev/null differ diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg deleted file mode 100755 index 09dc0ed814..0000000000 --- a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg +++ /dev/null @@ -1,105 +0,0 @@ - - - -Generated by IcoMoon - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf deleted file mode 100755 index 9e1521d16b..0000000000 Binary files a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf and /dev/null differ diff --git a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff b/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff deleted file mode 100755 index 296048ff38..0000000000 Binary files a/platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff and /dev/null differ diff --git a/platform/commonUI/general/res/images/bg-splash.jpg b/platform/commonUI/general/res/images/bg-splash.jpg index 98abe542b0..77a2b0481a 100644 Binary files a/platform/commonUI/general/res/images/bg-splash.jpg and b/platform/commonUI/general/res/images/bg-splash.jpg differ diff --git a/platform/commonUI/general/res/sass/_about.scss b/platform/commonUI/general/res/sass/_about.scss index a676018961..a95ed0cd77 100644 --- a/platform/commonUI/general/res/sass/_about.scss +++ b/platform/commonUI/general/res/sass/_about.scss @@ -43,7 +43,7 @@ color: $colorAboutLink; } .s-description, - .s-btn { + .s-button { line-height: 2em; } .l-licenses-software { diff --git a/platform/commonUI/general/res/sass/_archetypes.scss b/platform/commonUI/general/res/sass/_archetypes.scss index 432566a1b4..d51944e2f4 100644 --- a/platform/commonUI/general/res/sass/_archetypes.scss +++ b/platform/commonUI/general/res/sass/_archetypes.scss @@ -121,17 +121,16 @@ .l-flex-row { @include flex-direction(row); &.flex-elem { @include flex(1 1 auto); } - .flex-elem { - height: inherit; - line-height: inherit; + > .flex-elem { min-width: 0; + &.holder:not(:last-child) { margin-right: $interiorMargin; } } .flex-container { @include flex-direction(row); } } .l-flex-col { @include flex-direction(column); - .flex-elem { + > .flex-elem { min-height: 0; &.holder:not(:last-child) { margin-bottom: $interiorMarginLg; } } diff --git a/platform/commonUI/general/res/sass/_autoflow.scss b/platform/commonUI/general/res/sass/_autoflow.scss index 6ad315f61e..2dc3bcbed3 100644 --- a/platform/commonUI/general/res/sass/_autoflow.scss +++ b/platform/commonUI/general/res/sass/_autoflow.scss @@ -29,7 +29,7 @@ font-size: 0.75rem; &:hover { - .l-autoflow-header .s-btn.change-column-width { + .l-autoflow-header .s-button.change-column-width { @include trans-prop-nice-fade(50ms); opacity: 1; } @@ -43,7 +43,7 @@ .t-last-update { overflow: hidden; } - .s-btn.change-column-width { + .s-button.change-column-width { @include trans-prop-nice-fade(500ms); opacity: 0; } diff --git a/platform/commonUI/general/res/sass/_constants.scss b/platform/commonUI/general/res/sass/_constants.scss index a07a7d6e56..1e609cc038 100644 --- a/platform/commonUI/general/res/sass/_constants.scss +++ b/platform/commonUI/general/res/sass/_constants.scss @@ -43,9 +43,10 @@ $ueColMargin: 1.5%; $ueAppLogoW: 80px; $ueEditToolBarH: 25px; $ueCollapsedPaneEdgeM: 22px; -$uePaneMiniTabH: $ueTopBarH; -$uePaneMiniTabW: 10px; -$uePaneMiniTabCollapsedW: 11px; +$uePaneMiniTabH: 22px; +$uePaneMiniTabW: 8px; +$uePaneMiniTabFontSize: 8px; +$uePaneMiniTabCollapsedW: 18px; $ueEditLeftPaneW: 75%; $treeSearchInputBarH: 25px; $ueTimeControlH: (33px, 18px, 20px); @@ -61,6 +62,9 @@ $ueDesktopMinW: 600px; $ovrTopBarH: 45px; $ovrFooterH: 24px; $overlayMargin: 25px; +/*************** Progress Overlay */ +$durEntryMs: 50ms; +$delayEntryMs: 100ms; /*************** Items */ $ueBrowseGridItemLg: 200px; $ueBrowseGridItemTopBarH: 20px; @@ -73,7 +77,7 @@ $treeTypeIconHPx: 16px; $treeTypeIconW: 18px; $treeContextTriggerW: 20px; /*************** Tabular */ -$tabularHeaderH: 22px; //18px +$tabularHeaderH: 22px; $tabularTdPadLR: $itemPadLR; $tabularTdPadTB: 3px; /*************** Imagery */ @@ -107,7 +111,7 @@ $bubbleMaxW: 300px; /*************** Forms */ $reqSymbolW: 15px; $reqSymbolM: $interiorMargin * 2; -$reqSymbolFontSize: 0.7em; +$reqSymbolFontSize: 0.75em; /*************** Wait Spinner Defaults */ $waitSpinnerD: 32px; $waitSpinnerTreeD: 20px; @@ -125,6 +129,7 @@ $menuLineH: 1.5rem; $menuLineHPx: 24px; $btnStdH: 25px; $btnToolbarH: $btnStdH; +$controlBarH: $btnStdH; $btnFrameH: 16px; /************************** PATHS */ @@ -136,8 +141,3 @@ $dirImgs: $dirCommonRes + 'images/'; $controlFadeMs: 100ms; $browseToEditAnimMs: 400ms; $editBorderPulseMs: 500ms; - -/************************** LIMITS */ -$glyphLimit: '\e603'; -$glyphLimitUpr: '\0000eb'; -$glyphLimitLwr: '\0000ee'; diff --git a/platform/commonUI/general/res/sass/_fixed-position.scss b/platform/commonUI/general/res/sass/_fixed-position.scss index 66c9baf7a6..03364c1983 100644 --- a/platform/commonUI/general/res/sass/_fixed-position.scss +++ b/platform/commonUI/general/res/sass/_fixed-position.scss @@ -21,7 +21,6 @@ *****************************************************************************/ .t-fixed-position { &.l-fixed-position { - // @include test(red); position: absolute; top: 0; right: 0; @@ -35,7 +34,6 @@ height: 100%; width: 100%; .l-grid { - // @include test(orange); position: absolute; height: 100%; width: 100%; @@ -49,11 +47,6 @@ position: absolute; border: 1px solid transparent; - &.s-selected { - @include boxShdwLarge(); - border-color: $colorKey; - cursor: move; - } &.s-not-selected { opacity: 0.8; } @@ -76,26 +69,19 @@ } .l-fixed-position-text { - //@include txtShdwSubtle(); border: 1px solid transparent; font-size: 0.8rem; - $p: 1px; //$interiorMarginSm; + $p: 1px; line-height: 100%; &.l-static-text { - // overflow: auto; padding: $p; } &.l-telemetry { .l-elem { - //@include absPosDefault($p); - //@include absPosDefault(0); box-sizing: border-box; display: block; padding: 2px; - //width: 50%; &.l-title { - //right: auto; - //left: $p; float: none; overflow: hidden; text-overflow: ellipsis; @@ -103,9 +89,6 @@ width: auto; } &.l-value { - // @include test(blue); - // right: $p; - // left: auto; border-radius: $smallCr; $valPad: 5px; float: right; @@ -125,7 +108,6 @@ .l-fixed-position-item-handle { $brd: 1px solid $colorKey; - // border-radius: $controlCr; background: rgba($colorKey, 0.5); cursor: crosshair; border: $brd; diff --git a/platform/commonUI/general/res/sass/_global.scss b/platform/commonUI/general/res/sass/_global.scss index 6f2fe22d08..9d3627f3aa 100644 --- a/platform/commonUI/general/res/sass/_global.scss +++ b/platform/commonUI/general/res/sass/_global.scss @@ -22,18 +22,34 @@ /************************** FONTS */ @font-face { /* - * Use https://icomoon.io/app with /platform/commonUI/general/res/fonts/symbols/icomoon.io-WTD-symbols-project.json + * Use https://icomoon.io/app with icomoon-project-openmct-symbols-16px.json + * to generate font files */ font-family: 'symbolsfont'; - src: url($dirCommonRes + 'fonts/symbols/wtdsymbols.eot'); - src: url($dirCommonRes + 'fonts/symbols/wtdsymbols.eot?#iefix') format('embedded-opentype'), - url($dirCommonRes + 'fonts/symbols/wtdsymbols.woff') format('woff'), - url($dirCommonRes + 'fonts/symbols/wtdsymbols.ttf') format('truetype'), - url($dirCommonRes + 'fonts/symbols/wtdsymbols.svg#armataregular') format('svg'); + src: url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.eot'); + src: url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.eot?#iefix') format('embedded-opentype'), + url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.woff') format('woff'), + url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.ttf') format('truetype'), + url($dirCommonRes + 'fonts/symbols/openmct-symbols-16px.svg') format('svg'); font-weight: normal; font-style: normal; } +@font-face { + /* + * Use https://icomoon.io/app with icomoon-project-openmct-symbols-12px.json + * to generate font files + */ + font-family: 'symbolsfont 12px'; + src: url($dirCommonRes + 'fonts/symbols/openmct-symbols-12px.eot'); + src: url($dirCommonRes + 'fonts/symbols/openmct-symbols-12px.eot?#iefix') format('embedded-opentype'), + url($dirCommonRes + 'fonts/symbols/openmct-symbols-12px.woff') format('woff'), + url($dirCommonRes + 'fonts/symbols/openmct-symbols-12px.ttf') format('truetype'), + url($dirCommonRes + 'fonts/symbols/openmct-symbols-12px.svg') format('svg'); + font-weight: normal; + font-style: normal; +} + /************************** HTML ENTITIES */ a { color: $colorA; diff --git a/platform/commonUI/general/res/sass/_glyphs.scss b/platform/commonUI/general/res/sass/_glyphs.scss new file mode 100644 index 0000000000..876cf36c0a --- /dev/null +++ b/platform/commonUI/general/res/sass/_glyphs.scss @@ -0,0 +1,212 @@ +@mixin glyph($unicode, $family: 'symbolsfont') { + &:before { + content: $unicode; + font-family: $family; + } +} + +/************************** CHAR UNICODES */ + +$glyph-icon-alert-rect: '\e900'; +$glyph-icon-alert-triangle: '\e901'; +$glyph-icon-arrow-down: '\e902'; +$glyph-icon-arrow-left: '\e903'; +$glyph-icon-arrow-right: '\e904'; +$glyph-icon-arrow-double-up: '\e905'; +$glyph-icon-arrow-tall-up: '\e906'; +$glyph-icon-arrow-tall-down: '\e907'; +$glyph-icon-arrow-double-down: '\e908'; +$glyph-icon-arrow-up: '\e909'; +$glyph-icon-asterisk: '\e910'; +$glyph-icon-bell: '\e911'; +$glyph-icon-box: '\e912'; +$glyph-icon-box-with-arrow: '\e913'; +$glyph-icon-check: '\e914'; +$glyph-icon-connectivity: '\e915'; +$glyph-icon-database-in-brackets: '\e916'; +$glyph-icon-eye-open: '\e917'; +$glyph-icon-gear: '\e918'; +$glyph-icon-hourglass: '\e919'; +$glyph-icon-info: '\e920'; +$glyph-icon-link: '\e921'; +$glyph-icon-lock: '\e922'; +$glyph-icon-minus: '\e923'; +$glyph-icon-people: '\e924'; +$glyph-icon-person: '\e925'; +$glyph-icon-plus: '\e926'; +$glyph-icon-trash: '\e927'; +$glyph-icon-x: '\e928'; +$glyph-icon-brackets: '\e929'; +$glyph-icon-arrows-out: '\e1000'; +$glyph-icon-arrows-right-left: '\e1001'; +$glyph-icon-arrows-up-down: '\e1002'; +$glyph-icon-box-with-dashed-lines: ''; +$glyph-icon-bullet: '\e1004'; +$glyph-icon-calendar: '\e1005'; +$glyph-icon-chain-links: '\e1006'; +$glyph-icon-collapse-pane-left: '\e1007'; +$glyph-icon-collapse-pane-right: '\e1008'; +$glyph-icon-download: '\e1009'; +$glyph-icon-duplicate: '\e1010'; +$glyph-icon-folder-new: '\e1011'; +$glyph-icon-fullscreen-collapse: '\e1012'; +$glyph-icon-fullscreen-expand: '\e1013'; +$glyph-icon-layers: '\e1014'; +$glyph-icon-line-horz: '\e1015'; +$glyph-icon-magnify: '\e1016'; +$glyph-icon-magnify-in: '\e1017'; +$glyph-icon-magnify-out: '\e1018'; +$glyph-icon-menu-hamburger: '\e1019'; +$glyph-icon-move: '\e1020'; +$glyph-icon-new-window: '\e1021'; +$glyph-icon-paint-bucket: '\e1022'; +$glyph-icon-pause: '\e1023'; +$glyph-icon-pencil: '\e1024'; +$glyph-icon-play: '\e1025'; +$glyph-icon-plot-resource: '\e1026'; +$glyph-icon-pointer-left: '\e1027'; +$glyph-icon-pointer-right: '\e1028'; +$glyph-icon-refresh: '\e1029'; +$glyph-icon-save: '\e1030'; +$glyph-icon-sine: '\e1031'; +$glyph-icon-T: '\e1032'; +$glyph-icon-thumbs-strip: '\e1033'; +$glyph-icon-two-parts-both: '\e1034'; +$glyph-icon-two-parts-one-only: '\e1035'; +$glyph-icon-x-in-circle: '\e1036'; +$glyph-icon-activity: '\e1100'; +$glyph-icon-activity-mode: '\e1101'; +$glyph-icon-autoflow-tabular: '\e1102'; +$glyph-icon-clock: '\e1103'; +$glyph-icon-database: '\e1104'; +$glyph-icon-database-query: '\e1105'; +$glyph-icon-dataset: '\e1106'; +$glyph-icon-datatable: '\e1107'; +$glyph-icon-dictionary: '\e1108'; +$glyph-icon-folder: '\e1109'; +$glyph-icon-image: '\e1110'; +$glyph-icon-layout: '\e1111'; +$glyph-icon-object: '\e1112'; +$glyph-icon-object-unknown: '\e1113'; +$glyph-icon-packet: '\e1114'; +$glyph-icon-page: '\e1115'; +$glyph-icon-plot-overlay: '\e1116'; +$glyph-icon-plot-stacked: '\e1117'; +$glyph-icon-session: '\e1118'; +$glyph-icon-tabular: '\e1119'; +$glyph-icon-tabular-lad: '\e1120'; +$glyph-icon-tabular-lad-set: '\e1121'; +$glyph-icon-tabular-realtime: '\e1122'; +$glyph-icon-tabular-scrolling: '\e1123'; +$glyph-icon-telemetry: '\e1124'; +$glyph-icon-telemetry-panel: '\e1125'; +$glyph-icon-timeline: '\e1126'; +$glyph-icon-timer: '\e1127'; +$glyph-icon-topic: '\e1128'; +$glyph-icon-box-with-dashed-lines: '\e1129'; + +/************************** 16 PX CLASSES */ + +.icon-alert-rect { @include glyph($glyph-icon-alert-rect); } +.icon-alert-triangle { @include glyph($glyph-icon-alert-triangle); } +.icon-arrow-down { @include glyph($glyph-icon-arrow-down); } +.icon-arrow-left { @include glyph($glyph-icon-arrow-left); } +.icon-arrow-right { @include glyph($glyph-icon-arrow-right); } +.icon-arrow-double-up { @include glyph($glyph-icon-arrow-double-up); } +.icon-arrow-tall-up { @include glyph($glyph-icon-arrow-tall-up); } +.icon-arrow-tall-down { @include glyph($glyph-icon-arrow-tall-down); } +.icon-arrow-double-down { @include glyph($glyph-icon-arrow-double-down); } +.icon-arrow-up { @include glyph($glyph-icon-arrow-up); } +.icon-asterisk { @include glyph($glyph-icon-asterisk); } +.icon-bell { @include glyph($glyph-icon-bell); } +.icon-box { @include glyph($glyph-icon-box); } +.icon-box-with-arrow { @include glyph($glyph-icon-box-with-arrow); } +.icon-check { @include glyph($glyph-icon-check); } +.icon-connectivity { @include glyph($glyph-icon-connectivity); } +.icon-database-in-brackets { @include glyph($glyph-icon-database-in-brackets); } +.icon-eye-open { @include glyph($glyph-icon-eye-open); } +.icon-gear { @include glyph($glyph-icon-gear); } +.icon-hourglass { @include glyph($glyph-icon-hourglass); } +.icon-info { @include glyph($glyph-icon-info); } +.icon-link { @include glyph($glyph-icon-link); } +.icon-lock { @include glyph($glyph-icon-lock); } +.icon-minus { @include glyph($glyph-icon-minus); } +.icon-people { @include glyph($glyph-icon-people); } +.icon-person { @include glyph($glyph-icon-person); } +.icon-plus { @include glyph($glyph-icon-plus); } +.icon-trash { @include glyph($glyph-icon-trash); } +.icon-x { @include glyph($glyph-icon-x); } +.icon-brackets { @include glyph($glyph-icon-brackets); } +.icon-arrows-out { @include glyph($glyph-icon-arrows-out); } +.icon-arrows-right-left { @include glyph($glyph-icon-arrows-right-left); } +.icon-arrows-up-down { @include glyph($glyph-icon-arrows-up-down); } +.icon-bullet { @include glyph($glyph-icon-bullet); } +.icon-calendar { @include glyph($glyph-icon-calendar); } +.icon-chain-links { @include glyph($glyph-icon-chain-links); } +.icon-collapse-pane-left { @include glyph($glyph-icon-collapse-pane-left); } +.icon-collapse-pane-right { @include glyph($glyph-icon-collapse-pane-right); } +.icon-download { @include glyph($glyph-icon-download); } +.icon-duplicate { @include glyph($glyph-icon-duplicate); } +.icon-folder-new { @include glyph($glyph-icon-folder-new); } +.icon-fullscreen-collapse { @include glyph($glyph-icon-fullscreen-collapse); } +.icon-fullscreen-expand { @include glyph($glyph-icon-fullscreen-expand); } +.icon-layers { @include glyph($glyph-icon-layers); } +.icon-line-horz { @include glyph($glyph-icon-line-horz); } +.icon-magnify { @include glyph($glyph-icon-magnify); } +.icon-magnify-in { @include glyph($glyph-icon-magnify-in); } +.icon-magnify-out { @include glyph($glyph-icon-magnify-out); } +.icon-menu-hamburger { @include glyph($glyph-icon-menu-hamburger); } +.icon-move { @include glyph($glyph-icon-move); } +.icon-new-window { @include glyph($glyph-icon-new-window); } +.icon-paint-bucket { @include glyph($glyph-icon-paint-bucket); } +.icon-pause { @include glyph($glyph-icon-pause); } +.icon-pencil { @include glyph($glyph-icon-pencil); } +.icon-play { @include glyph($glyph-icon-play); } +.icon-plot-resource { @include glyph($glyph-icon-plot-resource); } +.icon-pointer-left { @include glyph($glyph-icon-pointer-left); } +.icon-pointer-right { @include glyph($glyph-icon-pointer-right); } +.icon-refresh { @include glyph($glyph-icon-refresh); } +.icon-save { @include glyph($glyph-icon-save); } +.icon-sine { @include glyph($glyph-icon-sine); } +.icon-T { @include glyph($glyph-icon-T); } +.icon-thumbs-strip { @include glyph($glyph-icon-thumbs-strip); } +.icon-two-parts-both { @include glyph($glyph-icon-two-parts-both); } +.icon-two-parts-one-only { @include glyph($glyph-icon-two-parts-one-only); } +.icon-x-in-circle { @include glyph($glyph-icon-x-in-circle); } +.icon-activity { @include glyph($glyph-icon-activity); } +.icon-activity-mode { @include glyph($glyph-icon-activity-mode); } +.icon-autoflow-tabular { @include glyph($glyph-icon-autoflow-tabular); } +.icon-clock { @include glyph($glyph-icon-clock); } +.icon-database { @include glyph($glyph-icon-database); } +.icon-database-query { @include glyph($glyph-icon-database-query); } +.icon-dataset { @include glyph($glyph-icon-dataset); } +.icon-datatable { @include glyph($glyph-icon-datatable); } +.icon-dictionary { @include glyph($glyph-icon-dictionary); } +.icon-folder { @include glyph($glyph-icon-folder); } +.icon-image { @include glyph($glyph-icon-image); } +.icon-layout { @include glyph($glyph-icon-layout); } +.icon-object { @include glyph($glyph-icon-object); } +.icon-object-unknown { @include glyph($glyph-icon-object-unknown); } +.icon-packet { @include glyph($glyph-icon-packet); } +.icon-page { @include glyph($glyph-icon-page); } +.icon-plot-overlay { @include glyph($glyph-icon-plot-overlay); } +.icon-plot-stacked { @include glyph($glyph-icon-plot-stacked); } +.icon-session { @include glyph($glyph-icon-session); } +.icon-tabular { @include glyph($glyph-icon-tabular); } +.icon-tabular-lad { @include glyph($glyph-icon-tabular-lad); } +.icon-tabular-lad-set { @include glyph($glyph-icon-tabular-lad-set); } +.icon-tabular-realtime { @include glyph($glyph-icon-tabular-realtime); } +.icon-tabular-scrolling { @include glyph($glyph-icon-tabular-scrolling); } +.icon-telemetry { @include glyph($glyph-icon-telemetry); } +.icon-telemetry-panel { @include glyph($glyph-icon-telemetry-panel); } +.icon-timeline { @include glyph($glyph-icon-timeline); } +.icon-timer { @include glyph($glyph-icon-timer); } +.icon-topic { @include glyph($glyph-icon-topic); } +.icon-box-with-dashed-lines { @include glyph($glyph-icon-box-with-dashed-lines); } + +/************************** 12 PX CLASSES */ + +.icon-eye-open-12px { @include glyph($glyph-icon-eye-open,'symbolsfont-12px'); } +.icon-collapse-pane-left-12px { @include glyph($glyph-icon-collapse-pane-left,'symbolsfont-12px'); } +.icon-collapse-pane-right-12px { @include glyph($glyph-icon-collapse-pane-right,'symbolsfont-12px'); } +.icon-folder-12px { @include glyph($glyph-icon-folder,'symbolsfont-12px'); } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_icons.scss b/platform/commonUI/general/res/sass/_icons.scss index 8922fe241e..a8990d4fe8 100644 --- a/platform/commonUI/general/res/sass/_icons.scss +++ b/platform/commonUI/general/res/sass/_icons.scss @@ -30,25 +30,17 @@ .ui-symbol { font-family: 'symbolsfont'; - &.type-icon { - color: $colorObjHdrIc; - } - &.icon { - color: $colorKey; - font-size: inherit; - &.alert { - color: $colorAlert; - &:hover { - color: lighten($colorAlert, $ltGamma); - } - } - &.major { - font-size: 1.65em; - } - } - &.icon-calendar:after { - content: "\e605"; - } +} + +.ui-symbol.icon { + color: $colorKey; + font-size: inherit; + &.alert { + color: $colorAlert; + &:hover { + color: lighten($colorAlert, $ltGamma); + } + } } .bar .ui-symbol { @@ -60,39 +52,31 @@ display: inline-block; } -.s-menu-btn .invoke-menu, +.s-menu-button .invoke-menu, .icon.major .invoke-menu { margin-left: $interiorMarginSm; } .menu .type-icon, .tree-item .type-icon, -.super-menu.menu .type-icon { +.super-menu.menu .menu-item-a:before { position: absolute; } -.l-icon-alert { - display: none !important; - &:before { - color: $colorAlert; - content: "!"; - } -} - .t-item-icon { // Used in grid-item.html, tree-item, inspector location @extend .ui-symbol; @extend .icon; - line-height: normal; // This is Ok for the symbolsfont + line-height: inherit; position: relative; &.l-icon-link { .t-item-icon-glyph { - &:before { + &:after { color: $colorIconLink; - content: "\f4"; + content: $glyph-icon-link; height: auto; width: auto; position: absolute; - left: 0; top: 0; right: 0; bottom: 10%; + left: 0; top: 0; right: 0; bottom: 20%; @include transform-origin(bottom left); @include transform(scale(0.3)); z-index: 2; diff --git a/platform/commonUI/general/res/sass/_inspector.scss b/platform/commonUI/general/res/sass/_inspector.scss index 68784ceca8..7d30c978af 100644 --- a/platform/commonUI/general/res/sass/_inspector.scss +++ b/platform/commonUI/general/res/sass/_inspector.scss @@ -39,14 +39,6 @@ .pane-header { color: pushBack($colorInspectorFg, 20%); font-size: 0.8rem; - &:before { - color: pushBack($colorInspectorFg, 10%); - content: '\e615'; // e615 Crosshair symbol - display: inline; - font-family: symbolsfont; - margin-right: $interiorMargin; - vertical-align: bottom; - } } .split-layout { @@ -79,7 +71,7 @@ .form { margin-bottom: $interiorMarginSm; padding-bottom: $interiorMarginLg; - .form-section { + .l-section-body { margin-bottom: 0; &:not(.first) { border-top: 1px solid $colorFormLines; @@ -115,7 +107,7 @@ background-color: $colorInspectorSectionHeaderBg; color: $colorInspectorSectionHeaderFg; margin-bottom: $interiorMargin; - padding: $formTBPad $formLRPad; + padding: floor($formTBPad * .75) $formLRPad; text-transform: uppercase; } @@ -159,7 +151,7 @@ } &:not(.last) .t-object-label .t-title-label:after { color: pushBack($colorInspectorFg, 15%); - content: '\3e'; + content: '\e904'; display: inline-block; font-family: symbolsfont; font-size: 8px; diff --git a/platform/commonUI/general/res/sass/_limits.scss b/platform/commonUI/general/res/sass/_limits.scss index 51f9a1c863..4eaee19ec1 100644 --- a/platform/commonUI/general/res/sass/_limits.scss +++ b/platform/commonUI/general/res/sass/_limits.scss @@ -1,4 +1,4 @@ -@mixin limitGlyph($iconColor, $glyph: $glyphLimit) { +@mixin limitGlyph($iconColor, $glyph: $glyph-icon-alert-triangle) { &:before { color: $iconColor; content: $glyph; @@ -21,8 +21,8 @@ tr[class*="s-limit"] { &.s-limit-yellow td:first-child { @include limitGlyph($colorLimitYellowIc); } - &.s-limit-upr td:first-child:before { content:$glyphLimitUpr; } - &.s-limit-lwr td:first-child:before { content:$glyphLimitLwr; } + &.s-limit-upr td:first-child:before { content: $glyph-icon-arrow-double-up; } + &.s-limit-lwr td:first-child:before { content: $glyph-icon-arrow-double-down; } } // Handle limit when applied directly to a non-tr element @@ -34,6 +34,6 @@ tr[class*="s-limit"] { &.s-limit-yellow { @include limitGlyph($colorLimitYellowIc); } - &.s-limit-upr:before { content:$glyphLimitUpr; } - &.s-limit-lwr:before { content:$glyphLimitLwr; } + &.s-limit-upr:before { content: $glyph-icon-arrow-double-up; } + &.s-limit-lwr:before { content: $glyph-icon-arrow-double-down; } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/_main.scss b/platform/commonUI/general/res/sass/_main.scss index 7e2705b64d..e092f1474a 100644 --- a/platform/commonUI/general/res/sass/_main.scss +++ b/platform/commonUI/general/res/sass/_main.scss @@ -21,6 +21,7 @@ *****************************************************************************/ @import "effects"; @import "global"; +@import "glyphs"; @import "archetypes"; @import "about"; @import "text"; @@ -64,6 +65,7 @@ @import "user-environ/frame"; @import "user-environ/top-bar"; @import "user-environ/tool-bar"; +@import "user-environ/selecting"; /********************************* VIEWS */ @import "fixed-position"; diff --git a/platform/commonUI/general/res/sass/_mixins.scss b/platform/commonUI/general/res/sass/_mixins.scss index a6badcf361..318bfff495 100644 --- a/platform/commonUI/general/res/sass/_mixins.scss +++ b/platform/commonUI/general/res/sass/_mixins.scss @@ -294,10 +294,9 @@ @function splitterHandleInset($splitterD: 21px, $splitterHandleD: 1px) { // Space to either side of the handle - @return ($splitterD - $splitterHandleD) * 0.5; + @return ($splitterD - $splitterHandleD) / 2; } - /*********************************************** CONTROLS, FORM ELEMENTS */ @mixin containerBase($bg: $colorBodyBg, $fg: $colorBodyFg) { @@ -305,24 +304,34 @@ border-radius: $controlCr; box-sizing: border-box; color: $fg; - display: inline-block; + //display: inline-block; } -@mixin btnBase($bg: $colorBodyBg, $bgHovColor: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) { +@mixin btnBase($bg: $colorBtnBg, $bgHov: $colorBtnBgHov, $fg: $colorBtnFg, $fgHov: $colorBtnFgHov, $ic: $colorBtnIcon, $icHov: $colorBtnIconHov) { @include user-select(none); - .icon { + color: $fg; + .icon, + &:before { color: $ic; } - @if $bgHovColor != none { + @if $bgHov != none { &:not(.disabled):hover { - background: $bgHovColor; // was just background, and background-image before that - >.icon { - color: lighten($ic, $ltGamma); + background: $bgHov; + color: $fgHov; + >.icon, + &:before { + color: $icHov; } } } } +@mixin btnSubtle($bg: $colorBtnBg, $bgHov: $colorBtnBgHov, $fg: $colorBtnFg, $fgHov: $colorBtnFgHov, $ic: $colorBtnIcon, $icHov: $colorBtnIconHov) { + @include containerSubtle($bg, $fg); + @include btnBase($bgHov: $bgHov, $fg: $fg, $fgHov: $fgHov, $ic: $ic, $icHov: $icHov); + text-shadow: $shdwItemText; +} + @mixin input-base($bg: $colorInputBg, $fg: $colorInputFg, $shdw: rgba(black, 0.6) 0 1px 3px) { @include appearance(none); border-radius: $controlCr; @@ -344,7 +353,7 @@ @mixin contextArrow() { text-shadow: none; - content: '\76'; + content: $glyph-icon-arrow-down; display: inline-block; font-family: 'symbolsfont'; margin-left: $interiorMarginSm; diff --git a/platform/commonUI/general/res/sass/_object-label.scss b/platform/commonUI/general/res/sass/_object-label.scss index fc9410c01d..bcaaf18b9c 100644 --- a/platform/commonUI/general/res/sass/_object-label.scss +++ b/platform/commonUI/general/res/sass/_object-label.scss @@ -35,31 +35,28 @@ } } -mct-representation, -.rep-object-label { - &.s-status-pending { - .t-object-label { - .t-item-icon { - &:before { - @include spinner($waitSpinnerTreeBorderW, $colorLoadingFg); - content: ""; - height: $waitSpinnerTreeD; width: $waitSpinnerTreeD; - } - .t-item-icon-glyph { - display: none; - } +.s-status-pending { + > .t-object-label { + .t-item-icon { + &:after { + @include spinner($waitSpinnerTreeBorderW, $colorLoadingFg); + content: ""; + height: $waitSpinnerTreeD; width: $waitSpinnerTreeD; } - .t-title-label { - font-style: italic; - opacity: 0.6; + .t-item-icon-glyph, + &:before { + display: none; } } + .t-title-label { + font-style: italic; + opacity: 0.6; + } } } -.selected mct-representation, -.selected .rep-object-label { - .s-status-pending .t-object-label .t-item-icon:before { +.selected { + .s-status-pending .t-object-label .t-item-icon:after { border-color: rgba($colorItemTreeSelectedFg, 0.25) !important; border-top-color: rgba($colorItemTreeSelectedFg, 1.0) !important; } diff --git a/platform/commonUI/general/res/sass/_views.scss b/platform/commonUI/general/res/sass/_views.scss index 96c78f1dd2..0a4cc651dd 100644 --- a/platform/commonUI/general/res/sass/_views.scss +++ b/platform/commonUI/general/res/sass/_views.scss @@ -1,8 +1,11 @@ /* Styles for sub-dividing views generically */ +.l-control-bar { + // Element that can be placed above l-view-section, holds controls, buttons, etc. + height: $controlBarH; +} .l-view-section { @include absPosDefault(0); - font-size: 0.8rem; h2 { color: #fff; margin-bottom: $interiorMargin; @@ -15,4 +18,23 @@ .inline-block { display: inline-block; } +} + +.has-control-bar { + .l-view-section { + top: $controlBarH + $interiorMargin; + } +} + + +.child-frame { + .has-control-bar { + $btnExportH: $btnFrameH; + .l-control-bar { + display: none; + } + .l-view-section { + top: 0; + } + } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/controls/_buttons.scss b/platform/commonUI/general/res/sass/controls/_buttons.scss index b360f5aa9e..17e03941df 100644 --- a/platform/commonUI/general/res/sass/controls/_buttons.scss +++ b/platform/commonUI/general/res/sass/controls/_buttons.scss @@ -22,21 +22,24 @@ $baseRatio: 1.5; $pad: $interiorMargin * $baseRatio; -.s-btn, -.s-icon-btn { +.s-button, +button { @include user-select(none); + @include btnSubtle($bg: $colorBtnBg, $bgHov: $colorBtnBgHov, $fg: $colorBtnFg, $ic: $colorBtnIcon); + box-sizing: border-box; cursor: pointer; + display: inline-block; + font-size: 0.7rem; text-decoration: none; height: $btnStdH; line-height: $btnStdH; -} - -.s-btn { - box-sizing: border-box; padding: 0 $pad; - font-size: 0.7rem; vertical-align: top; - @include btnSubtle($colorBtnBg, $colorBtnBgHov, $colorBtnFg, $colorBtnIcon); + + &.labeled:before { + // Icon when it's included + margin-right: $interiorMarginSm; + } &.lg { font-size: 1rem; @@ -50,58 +53,20 @@ $pad: $interiorMargin * $baseRatio; padding: 0 ($pad / $baseRatio) / 2; } - &.major, - &.key-edit, - &.key-properties { - $bg: $colorBtnMajorBg; - $hc: lighten($bg, 10%); - @include btnSubtle($bg, $hc, $colorBtnMajorFg, $colorBtnMajorFg); + &.major { + @include btnSubtle($bg: $colorBtnMajorBg, $bgHov: $colorBtnMajorBgHov, $fg: $colorBtnMajorFg, $fgHov: $colorBtnMajorFgHov, $ic: $colorBtnMajorFg, $icHov: $colorBtnMajorFgHov); } - &.t-save:before { - content:'\e612'; - font-family: symbolsfont; - margin-right: $interiorMarginSm; - } - &.t-save-as:before { - content:'\e612'; - font-family: symbolsfont; - margin-right: $interiorMarginSm; - } - &.t-cancel { - .title-label { display: none; } - &:before { - content:'\78'; - font-family: symbolsfont; - } + &.no-label { + .label, .title-label { display: none; } } &.pause-play { - .icon:before { - content: "\0000F1"; - } + @extend .icon-pause; &.paused { - @include btnSubtle($colorPausedBg, pushBack($colorPausedBg, 10%), $colorPausedFg, $colorPausedFg); - .icon { - @include pulse($dur: 1000ms); - :before { - content: "\0000EF"; - } - } - } - } - - &.show-thumbs { - .icon:before { - content: "\000039"; - } - } - - &.t-export { - &:before { - @extend .ui-symbol; - @extend .icon; - content: '\e623'; + @include btnSubtle($bg: $colorPausedBg, $bgHov: pushBack($colorPausedBg, 10%), $fg: $colorPausedFg, $ic: $colorPausedFg); + @extend .icon-play; + &:before { @include pulse($dur: 1000ms); } } } @@ -114,166 +79,59 @@ $pad: $interiorMargin * $baseRatio; } } -.s-icon-btn { - @extend .ui-symbol; - // Color and styling additionally in _controls.scss -} - -body.desktop .mini-tab { - // Meant to be used as pane hide/show control elements in concert with mct-splitter - $iconH: $uePaneMiniTabH; - $iconW: $uePaneMiniTabW; - $iconInnerLR: 0; - $arwD: 9px; - $arwOffsetX: 0px; - $arwAnimOffsetX: 2px + $iconInnerLR; - $cBg: pullForward($colorBodyBg, 15%); - $cFg: $cBg; - - - border-radius: $basicCr; - //@include boxShdw($shdwBtns); - box-sizing: border-box; - @include trans-prop-nice((color, background-color), 100ms); - color: $cFg; - cursor: pointer; - font-family: symbolsfont; - font-size: $arwD; - display: block; - position: absolute; - line-height: $iconH; - height: $iconH; width: $iconW; - text-align: center; - - &.collapsed { - // State when the pane this element controls has been collapsed - @include btnSubtle($colorBtnBg, $colorKey, $colorBtnFg, $colorBtnIcon); - &:before { opacity: 0; } - &:after { opacity: 1; } - &:hover { - &:before { opacity: 1; } - &:after { opacity: 0; } - } - - } - - &:before, - &:after { - @include trans-prop-nice((left, right, opacity), 250ms); - display: block; - height: 100%; - position: absolute; - } - - &:before { - // Always the arrow icon - width: $arwD; - } - &:after { - // Always icon; content is set in _layout.scss - width: 100%; - text-align: center; - opacity: 0; - } - - &.anchor-left { - // |< - text-align: right; - &:before { - content:'\3c'; // Collapse left icon e613 - right: $iconInnerLR; - } - &.collapsed { - @include border-left-radius(0); - text-align: left; - &:before { - content:'\3e'; - left: $iconInnerLR; - } - &:hover:before { left: $arwAnimOffsetX; } - } - } - &.anchor-right { - // >| - text-align: left; - &:before { - content:'\3e'; // Collapse right icon e614 - left: $iconInnerLR; - } - &.collapsed { - @include border-right-radius(0); - &:before { - text-align: right; - content:'\3c'; - right: $iconInnerLR; - } - &:hover:before { right: $arwAnimOffsetX; } - } - } -} - body.desktop .mini-tab-icon { // Meant to be used as pane hide/show control elements in concert with mct-splitter - $d: $uePaneMiniTabW; - color: pullForward($colorBodyBg, 15%); + // Font glyphs set in _layout.scss + background-color: $colorMiniTabBg; + color: $colorMiniTabFg; cursor: pointer; display: block; - font-family: symbolsfont; - font-size: $d; + font-family: 'symbolsfont'; + font-size: $uePaneMiniTabFontSize; position: absolute; - height: $d; width: $d; - line-height: $d; + height: $uePaneMiniTabH; width: $uePaneMiniTabW; + line-height: $uePaneMiniTabH; overflow: hidden; - word-break: break-all; - - &.collapsed { - $d: $uePaneMiniTabCollapsedW; - width: $d; font-size: $d; - } - - &:before, - &:after { - position: absolute; - display: inherit; - } + text-align: center; &:before { - content: '\78'; // X icon + display: inline-block; } &:hover { - color: $colorKey; + background-color: $colorMiniTabBgHov; + color: $colorMiniTabFgHov; } } .l-btn-set { // Buttons that have a very tight conceptual grouping - no internal space between them. - // Structure: .btn-set > mct-representation class=first|last > .s-btn - font-size: 0; // Remove space between s-btn elements due to white space in markup + // Structure: .btn-set > mct-representation class=first|last > .s-button + font-size: 0; // Remove space between s-button elements due to white space in markup - .s-btn { + .s-button { border-radius: 0; margin-left: 1px; } .first { - .s-btn, - &.s-btn { + .s-button, + &.s-button { @include border-left-radius($controlCr); margin-left: 0; } } .last { - .s-btn, - &.s-btn { + .s-button, + &.s-button { @include border-right-radius($controlCr); } } } .paused { - &:not(.s-btn) { + &:not(.s-button) { border-color: $colorPausedBg !important; color: $colorPausedBg !important; } diff --git a/platform/commonUI/general/res/sass/controls/_color-palette.scss b/platform/commonUI/general/res/sass/controls/_color-palette.scss index bd3ea9eb0b..1f98c3afc1 100644 --- a/platform/commonUI/general/res/sass/controls/_color-palette.scss +++ b/platform/commonUI/general/res/sass/controls/_color-palette.scss @@ -40,13 +40,15 @@ border: 1px solid transparent; color: $colorSelectedColor; display: block; - font-family: 'symbolsfont'; float: left; height: $d; width: $d; - line-height: $d; + line-height: $d * 0.9; margin: 0 ($m * 1px) ($m * 1px) 0; text-align: center; - vertical-align: middle; + &:before { + // Check mark for selected items + font-size: 0.8em; + } } .s-palette-item { diff --git a/platform/commonUI/general/res/sass/controls/_controls.scss b/platform/commonUI/general/res/sass/controls/_controls.scss index 1a7a4631f7..d1935d8ce0 100644 --- a/platform/commonUI/general/res/sass/controls/_controls.scss +++ b/platform/commonUI/general/res/sass/controls/_controls.scss @@ -72,6 +72,23 @@ } } +.s-icon-button { + // Clickable icon elements that have hover + @extend .ui-symbol; + color: $colorClickIcon; + &:hover { + color: $colorClickIconHov; + } +} + +.s-toggle-icon { + // Has default (in-active) and .active states + @extend .s-icon-button; + color: $colorToggleIcon; + &:hover { color: rgba($colorToggleIconHov, 0.5); } + &.active { color: $colorToggleIconActive; } +} + .l-composite-control { vertical-align: middle; &:not(.l-inline) { @@ -166,10 +183,10 @@ label.radio.custom { } } -label.checkbox.custom input:checked ~ em:before { content: "\32"; } -label.radio.custom input:checked ~ em:before { content: "\e619"; } +label.checkbox.custom input:checked ~ em:before { content: $glyph-icon-check; } +label.radio.custom input:checked ~ em:before { content: $glyph-icon-bullet; } -.s-menu-btn label.checkbox.custom { +.s-menu-button label.checkbox.custom { margin-left: 5px; } @@ -199,6 +216,7 @@ input[type="search"] { .l-input-lg input[type="text"] { width: 100% !important; } .l-input-med input[type="text"] { width: 200px !important; } .l-input-sm input[type="text"] { width: 50px !important; } +.l-textarea-sm textarea { position: relative; height: 50px; } .l-numeric input[type="text"] { text-align: right; } .input-labeled { @@ -218,10 +236,12 @@ input[type="search"] { /******************************************************** SELECTS */ .select { - @include btnSubtle($colorSelectBg); + @include btnSubtle($bg: $colorSelectBg); + @extend .icon-arrow-down; // Context arrow @if $shdwBtns != none { margin: 0 0 2px 0; // Needed to avoid dropshadow from being clipped by parent containers } + display: inline-block; padding: 0 $interiorMargin; overflow: hidden; position: relative; @@ -239,10 +259,11 @@ input[type="search"] { margin: $interiorMargin 0; // Firefox } } - &:after { - @include contextArrow(); + &:before { + //@include contextArrow(); pointer-events: none; color: rgba($colorSelectFg, percentToDecimal($contrastInvokeMenuPercent)); + display: block; position: absolute; right: $interiorMargin; top: 0; } @@ -439,17 +460,13 @@ input[type="search"] { width: $pagerW; @extend .ui-symbol; &.prev { + @extend .icon-arrow-left; right: auto; - &:before { - content: "\3c"; - } } &.next { + @extend .icon-arrow-right; left: auto; text-align: right; - &:before { - content: "\3e"; - } } } .val { @@ -539,12 +556,11 @@ textarea { } /******************************************************** MISC */ -.context-available, -.s-icon-btn { - $c: $colorKey; - color: $c; +.context-available { + @extend .icon-arrow-down; + color: $colorKey; &:hover { - color: lighten($c, 10%); + color: $colorKeyHov; } } diff --git a/platform/commonUI/general/res/sass/controls/_menus.scss b/platform/commonUI/general/res/sass/controls/_menus.scss index 665ad339a7..61e87b5b2b 100644 --- a/platform/commonUI/general/res/sass/controls/_menus.scss +++ b/platform/commonUI/general/res/sass/controls/_menus.scss @@ -20,34 +20,41 @@ * at runtime from the About dialog for additional information. *****************************************************************************/ /******************************************************** MENU BUTTONS */ -.s-menu-btn { +.s-menu-button { // Formerly .btn-menu - @extend .s-btn; + @extend .s-button; span.l-click-area { // In markup, this element should not enclose anything. @extend .abs; } .icon { - font-size: 120%; + font-size: 16px; //120%; } .title-label { margin-left: $interiorMarginSm; } + .color-swatch { + // Used in color menu buttons in toolbar + $d: 10px; + display: inline-block; + border: 1px solid rgba($colorBtnFg, 0.2); + height: $d; width: $d; + vertical-align: middle; + margin-left: $interiorMarginSm; + margin-top: -2px; + } + &:after { // Adds the downward facing 'context available / invoke menu' arrow element @include contextArrow(); color: rgba($colorInvokeMenu, percentToDecimal($contrastInvokeMenuPercent)); } - &.create-btn { - &:before { - content:'\2b'; - display: inline; - font-family: symbolsfont; - } + &.create-button { + @extend .icon-plus; .title-label { font-size: 1rem; } @@ -56,9 +63,6 @@ .menu { left: 0; text-align: left; - .ui-symbol.icon { - width: 12px; - } } } @@ -77,6 +81,7 @@ } .menu { + // TODO: reduce size of icons @extend .s-menu; display: block; position: absolute; @@ -86,7 +91,8 @@ li { box-sizing: border-box; border-top: 1px solid pullForward($colorMenuBg, 10%); - color: pullForward($colorMenuBg, 60%); + color: $colorMenuFg; + //color: pullForward($colorMenuBg, 60%); line-height: $menuLineH; padding: $interiorMarginSm $interiorMargin * 2 $interiorMarginSm ($interiorMargin * 2) + $treeTypeIconW; position: relative; @@ -97,33 +103,37 @@ &:hover { background: $colorMenuHovBg; color: $colorMenuHovFg; - .icon { - color: $colorMenuHovIc; - } - } - .type-icon { - left: $interiorMargin * 2; + &:before { + color: $colorMenuHovIc; + } } + &:before { + @extend .ui-symbol; + @extend .type-icon; + @extend .icon; + display: inline-block; + left: $interiorMargin * 2; + } } } } .menu, +.icon-menu, .context-menu, .super-menu, -.s-menu-btn .menu { +.s-menu-button .menu { pointer-events: auto; ul li { - a { - color: $colorMenuFg; + a.menu-item-a { + color: $colorMenuFg; display: block; } - .icon { - color: $colorMenuIc; - } - .type-icon { - left: $interiorMargin; - } + &:before, + a.menu-item-a:before { + color: $colorMenuIc; + left: $interiorMargin; + } } } @@ -148,7 +158,8 @@ } } } - .type-icon { + &:before { + // Type icon left: 25px; } } diff --git a/platform/commonUI/general/res/sass/controls/_messages.scss b/platform/commonUI/general/res/sass/controls/_messages.scss index 7126006e95..2604d498bd 100644 --- a/platform/commonUI/general/res/sass/controls/_messages.scss +++ b/platform/commonUI/general/res/sass/controls/_messages.scss @@ -62,6 +62,12 @@ } } +.subdued { + .status-indicator { + color: pullForward($colorStatusBarBg, 40%); + } +} + .status-block-holder { // Applied to mct-include element // Contains status.block elements @@ -122,7 +128,7 @@ font-weight: bold; opacity: 1; } - .s-btn { + .s-button { background: $colorStatusBtnBg; padding: 0 $interiorMargin; height: auto; @@ -233,7 +239,7 @@ @mixin messageBlock($iconW: 32px) { .type-icon.message-type { @include txtShdw($shdwStatusIc); - &:before { content:"\e608"; } + @extend .icon-bell; color: $colorStatusDefault; font-size: $iconW; padding: 1px; @@ -241,15 +247,15 @@ } .message-severity-info .type-icon.message-type { - &:before { content:"\e608"; } + @extend .icon-info; color: $colorStatusInfo; } .message-severity-alert .type-icon.message-type { - &:before { content:"\e610"; } + @extend .icon-bell; color: $colorStatusAlert; } .message-severity-error .type-icon.message-type { - &:before { content:"\21"; } + @extend .icon-alert-rect; color: $colorStatusError; } } @@ -272,12 +278,10 @@ @include flex-direction(row); @include align-items(stretch); .type-icon.message-type { - //@include test(red); @include flex(0 1 auto); position: relative; } .message-contents { - //@include test(blue); @include flex(1 1 auto); margin-left: $overlayMargin; position: relative; diff --git a/platform/commonUI/general/res/sass/edit/_editor.scss b/platform/commonUI/general/res/sass/edit/_editor.scss index 565e9e0666..20132161b6 100644 --- a/platform/commonUI/general/res/sass/edit/_editor.scss +++ b/platform/commonUI/general/res/sass/edit/_editor.scss @@ -97,7 +97,7 @@ .frame.child-frame.panel { &:hover { @include boxShdwLarge(); - border-color: $colorKey; + border-color: $colorSelectableSelectedPrimary; .view-switcher { opacity: 1; } diff --git a/platform/commonUI/general/res/sass/features/_time-display.scss b/platform/commonUI/general/res/sass/features/_time-display.scss index 328402b0fd..94f64f9bb7 100644 --- a/platform/commonUI/general/res/sass/features/_time-display.scss +++ b/platform/commonUI/general/res/sass/features/_time-display.scss @@ -8,6 +8,15 @@ } &.l-timer { + .l-value:before, + .control { + font-size: 0.8em; + } + + .l-value:before { + // Direction +/- element + margin-right: $interiorMarginSm; + } .control { @include trans-prop-nice((width, opacity), $transTime); line-height: inherit; @@ -25,8 +34,5 @@ .value { color: pullForward($colorBodyFg, 50%); font-weight: 400; - .direction { - font-size: 0.8em; - } } } diff --git a/platform/commonUI/general/res/sass/forms/_channel-selector.scss b/platform/commonUI/general/res/sass/forms/_channel-selector.scss index 00de4437b8..615315ee63 100644 --- a/platform/commonUI/general/res/sass/forms/_channel-selector.scss +++ b/platform/commonUI/general/res/sass/forms/_channel-selector.scss @@ -36,7 +36,7 @@ .btns-add-remove { // background: rgba(#ff0000, 0.3);; margin-top: 150px; - .s-btn { + .s-button { display: block; //font-size: 1.5em; margin-bottom: $interiorMargin; diff --git a/platform/commonUI/general/res/sass/forms/_elems.scss b/platform/commonUI/general/res/sass/forms/_elems.scss index fcd04a7a53..186dd2f84f 100644 --- a/platform/commonUI/general/res/sass/forms/_elems.scss +++ b/platform/commonUI/general/res/sass/forms/_elems.scss @@ -25,11 +25,21 @@ .form { color: $colorFormText; + height: 100%; width: 100%; - .form-section { - position: relative; - margin-bottom: $interiorMarginLg * 2; - } + + .l-form-section { + position: relative; + &.grows { + .l-section-body, + .form-row { + @include flex(1 1 auto); + .wrapper { + height: 100%; + } + } + } + } .section-header { border-radius: $basicCr; @@ -43,10 +53,14 @@ .form-row { $m: $interiorMargin; box-sizing: border-box; - @include clearfix; border-top: 1px solid $colorFormLines; + margin-bottom: $interiorMarginLg * 2; padding: $formTBPad 0; position: relative; + //&ng-form { + // display: block; + //} + &.first { border-top: none; } @@ -92,17 +106,14 @@ .selector-list { // Used in create overlay to display tree view @include nice-input(); - $h: 150px; + padding: $interiorMargin; position: relative; - height: $h; + min-height: 150px; + height: 100%; >.wrapper { $p: $interiorMargin; + box-sizing: border-box; overflow: auto; - position: absolute; - top: $p; - right: $p; - bottom: $p; - left: $p; } } } @@ -136,18 +147,13 @@ } } -.no-validate { - .form .form-row >.label { - padding-right: 0; - &:after { - display: none; - } - } -} - .hint, .s-hint { font-size: 0.9em; + .req { + color: $colorFormRequired; + font-size: 0.7rem; + } } .l-result { diff --git a/platform/commonUI/general/res/sass/forms/_filter.scss b/platform/commonUI/general/res/sass/forms/_filter.scss index 27b017c14f..aa594c0765 100644 --- a/platform/commonUI/general/res/sass/forms/_filter.scss +++ b/platform/commonUI/general/res/sass/forms/_filter.scss @@ -85,6 +85,7 @@ .l-filter { $iconEdgeM: 4px; $iconD: $formInputH - ($iconEdgeM * 2); + @extend .icon-magnify; // Adds a magnifying glass before, holds an input and a clear button display: inline-block; position: relative; @@ -106,7 +107,6 @@ &:before { // Magnify glass icon - content:'\4d'; left: $interiorMargin; @include trans-prop-nice(color, 250ms); pointer-events: none; @@ -144,11 +144,4 @@ &:hover:before { color: pullForward($colorInputIcon, 10%); } - - .clear-icon { - // 'x' in circle icon - &:before { - content: '\e607'; - } - } } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/forms/_validation.scss b/platform/commonUI/general/res/sass/forms/_validation.scss index b985c158ed..b13e11cef9 100644 --- a/platform/commonUI/general/res/sass/forms/_validation.scss +++ b/platform/commonUI/general/res/sass/forms/_validation.scss @@ -19,43 +19,44 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -.validates { - > .label { - padding-right: $reqSymbolM; // Keep room for validation element - &::after { - position: absolute; - right: $interiorMargin; - font-family: symbolsfont; - font-size: $reqSymbolFontSize; - height: 100%; - line-height: 200%; +mct-form.validates { + .form-row.validates { + > .label { + padding-right: $reqSymbolM; // Keep room for validation element + &:before { + position: absolute; + right: $interiorMargin; + font-size: $reqSymbolFontSize; + height: 100%; + line-height: 200%; + } + } + &.invalid, + &.invalid.req { + > .label { + @extend .icon-x; + &:before { + color: $colorFormInvalid; + } + } + } + &.valid, + &.valid.req { + > .label { + @extend .icon-check; + &:before { + color: $colorFormValid; + } + } + } + &.req { + > .label { + @extend .icon-asterisk; + &:before { + color: $colorFormRequired; + } + } } } - &.invalid, - &.invalid.req { - > .label::after { - color: $colorFormInvalid; - content: "x"; - } - } - &.valid, - &.valid.req { - > .label::after { - color: $colorFormValid; - content: "2"; - } - } - &.req { - > .label::after { - color: $colorFormRequired; - content: "*"; - } - } -} -.req { - font-size: $reqSymbolFontSize; -} -span.req { - color: $colorFormRequired; } \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/helpers/_bubbles.scss b/platform/commonUI/general/res/sass/helpers/_bubbles.scss index e4cc8a2797..16bc08f0b4 100644 --- a/platform/commonUI/general/res/sass/helpers/_bubbles.scss +++ b/platform/commonUI/general/res/sass/helpers/_bubbles.scss @@ -21,9 +21,6 @@ *****************************************************************************/ //************************************************* GENERAL -.bubble-container { - pointer-events: none; -} //************************************************* LAYOUT diff --git a/platform/commonUI/general/res/sass/helpers/_splitter.scss b/platform/commonUI/general/res/sass/helpers/_splitter.scss index 0cf115fec0..bdedb9c3ec 100644 --- a/platform/commonUI/general/res/sass/helpers/_splitter.scss +++ b/platform/commonUI/general/res/sass/helpers/_splitter.scss @@ -26,7 +26,6 @@ // Main width is used to provide a good click area, and is always transparent // :after will be a positioned and colored element that is the handle - //@include test(red); display: block; position: absolute; z-index: 3; @@ -37,6 +36,7 @@ @include absPosDefault(0); background: $colorSplitterBg; display: block; + z-index: 4; @if $splitterEndCr != 'none' { border-radius: $splitterEndCr; @@ -61,7 +61,7 @@ } .split-layout { - $inset: splitterHandleInset($splitterD,$splitterHandleD); + $inset: splitterHandleInset($splitterD, $splitterHandleD); &.horizontal { // Slides vertically up and down, splitting the element horizontally overflow: hidden; // Suppress overall scroll; each internal pane handles its own overflow @@ -102,17 +102,16 @@ cursor: col-resize; top: 0; bottom: 0; - &:not(.flush-right) { - width: $splitterD; - &:after { - left: $inset; right: $inset; - } + width: $splitterD; + &:after { + left: $inset; right: $inset; + //width: $splitterHandleD; } &.flush-right { width: ceil($splitterD / 2); &:after { - background-color: transparent; - left: auto; right: 0; width: $splitterHandleD; + width: $splitterHandleD; + left: auto; right: 0; } &.edge-shdw { @include background-image(linear-gradient(90deg, rgba(black, 0) 40%, rgba(black, 0.05) 70%, rgba(black, 0.2) 100%)); @@ -120,4 +119,15 @@ } } } + &.splitter-sm { + $inset: splitterHandleInset($splitterDSm, $splitterHandleD); + .horizontal >.splitter { + height: $splitterDSm; + &:after { top: $inset; bottom: $inset; } + } + .vertical >.splitter { + width: $splitterDSm; + &:after { left: $inset; right: $inset; } + } + } } diff --git a/platform/commonUI/general/res/sass/items/_item.scss b/platform/commonUI/general/res/sass/items/_item.scss index 8588eeca80..ef1bacae42 100644 --- a/platform/commonUI/general/res/sass/items/_item.scss +++ b/platform/commonUI/general/res/sass/items/_item.scss @@ -31,7 +31,7 @@ $iconMargin: 40px; $iconD: ($d - ($iconMargin * 2)) * 0.85; $transTime: 200ms; - @include btnSubtle($colorItemBg, $colorItemBgHov, $colorItemFg, $colorItemIc); + @include btnSubtle($bg: $colorItemBg, $bgHov: $colorItemBgHov, $fg: $colorItemFg, $fgHov: pullForward($colorItemFg, $hoverRatioPercent), $ic: $colorItemIc); box-sizing: border-box; cursor: pointer; float: left; @@ -91,7 +91,7 @@ font-size: $iconD * 0.95; &.l-icon-link { .t-item-icon-glyph { - &:before { + &:after { @include transform(scale(0.25)); } } @@ -121,7 +121,7 @@ &.selected { $cfg: lighten($colorItemBgSelected, 35%); $cfgh: lighten($cfg, 30%); - @include btnSubtle($colorItemBgSelected); + @include btnSubtle($bg: $colorItemBgSelected); color: $cfg; .item-type, .top-bar .icon:not(.alert) { color: $cfg } .item-main .item-open { color: $cfg } diff --git a/platform/commonUI/general/res/sass/lists/_tabular.scss b/platform/commonUI/general/res/sass/lists/_tabular.scss index da35a3f823..d68486547e 100644 --- a/platform/commonUI/general/res/sass/lists/_tabular.scss +++ b/platform/commonUI/general/res/sass/lists/_tabular.scss @@ -86,12 +86,12 @@ table { color: $colorIconLink; font-family: symbolsfont; font-size: 8px; - content: "\ed"; + content: "\e906"; display: inline-block; margin-left: $interiorMarginSm; } &.sort.desc:after { - content: "\ec"; + content: "\e907"; } } &.sortable { @@ -119,19 +119,12 @@ table { } } &.filterable { - thead, .thead { - tr.s-filters, .tr.s-filters { - th, .th { - //border-left: none; - } - } - } tbody, .tbody { top: $tabularHeaderH * 2; } input[type="text"] { box-sizing: border-box; - width: 100%; //50px; + width: 100%; } } @@ -167,40 +160,3 @@ table { } } } - -/********************************************************** SPECIFIC TABULAR VIEWS */ -.tabular-holder { - &.t-exportable { - $btnExportH: 25px; - .l-view-section { - top: $btnExportH + $interiorMargin; - } - } -} - -.child-frame { - .tabular-holder { - &.t-exportable { - $btnExportH: $btnFrameH; - .s-btn.t-export { - @include trans-prop-nice(opacity, $dur: 50ms); - opacity: 0; - } - .l-view-section { - @include trans-prop-nice(top, $dur: 150ms, $delay: 50ms); - top: 0; - } - &:hover { - .s-btn.t-export { - @include trans-prop-nice(opacity, 150ms, 100ms); - opacity: 1; - } - .l-view-section { - @include trans-prop-nice(top, $dur: 150ms); - top: $btnExportH + $interiorMargin; - } - } - } - } - -} \ No newline at end of file diff --git a/platform/commonUI/general/res/sass/mobile/_layout.scss b/platform/commonUI/general/res/sass/mobile/_layout.scss index 4e7c2b01d4..777990235a 100644 --- a/platform/commonUI/general/res/sass/mobile/_layout.scss +++ b/platform/commonUI/general/res/sass/mobile/_layout.scss @@ -37,7 +37,7 @@ body.mobile { } } - .create-btn-holder { + .create-button-holder { // Hide the create button by default in mobile; // This can be overridden by the examples/mobile bundle display: none; @@ -88,10 +88,7 @@ body.mobile { position: absolute; top: $bodyMargin + 2; left: $bodyMargin; - &:after { - content:'m' !important; - font-family: symbolsfont; - } + @extend .icon-menu-hamburger; } .object-browse-bar { diff --git a/platform/commonUI/general/res/sass/mobile/_tree.scss b/platform/commonUI/general/res/sass/mobile/_tree.scss index 40f1ae0969..e45472fed4 100644 --- a/platform/commonUI/general/res/sass/mobile/_tree.scss +++ b/platform/commonUI/general/res/sass/mobile/_tree.scss @@ -32,28 +32,37 @@ body.touch { .search-result-item { height: $mobileTreeItemH !important; line-height: $mobileTreeItemH !important; - margin-bottom: 0px !important; .view-control { - font-size: 1.2em; - margin-right: 0; - order: 2; - width: $mobileTreeItemH; + font-size: 1em; + margin-right: $interiorMargin; + width: ceil($mobileTreeItemH * 0.75); &.has-children { &:before { - content: "\7d"; + content: $glyph-icon-arrow-down; left: 50%; - @include transform(translateX(-50%) rotate(270deg)); + @include transform(translateX(-50%) rotate(-90deg)); } &.expanded:before { - @include transform(translateX(-50%) rotate(90deg)); + @include transform(translateX(-50%) rotate(0deg)); } } } .t-object-label { line-height: inherit; - .t-item-icon.l-icon-link .t-item-icon-glyph:before { + .t-item-icon.l-icon-link .t-item-icon-glyph:after { bottom: 20%; // Shift up due to height of mobile menu items } } } + + .pane.treeview { + .tree-item, + .search-result-item { + @include containerSubtle($bg: $colorMobilePaneLeftTreeItemBg, $gradRatio: 2%); + } + } + + .selector-list .tree-item { + @include containerBase($bg: $colorMobileSelectListTreeItemBg); + } } diff --git a/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss b/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss index a5459aa1d9..1feb4f1c9a 100644 --- a/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/mobile/overlay/_overlay.scss @@ -25,7 +25,6 @@ @include phone { .overlay > .holder { - //@include test(orange); // This works! $m: 0; border-radius: $m; top: $m; @@ -38,36 +37,30 @@ overflow: auto; @include transform(none); - .editor .form .form-row { - > .label, - > .controls { - //@include test(blue); - display: block; - float: none; - width: 100%; - } - > .label { - &:after { - float: none; + .editor .form .form-row.l-flex-row { + // Display elements in a columnar view + @include flex-direction(column); + > .flex-elem { + &:not(:first-child) { + margin-top: $interiorMargin; + } + &.label { + width: 100%; + } + &.controls { + overflow: auto; } } - } - - .contents { - .abs.top-bar, - .abs.editor, - .abs.message-body, - .abs.bottom-bar { - //@include test(orange); - top: auto; right: auto; bottom: auto; left: auto; - height: auto; width: auto; - margin-bottom: $interiorMarginLg * 2; + + &.validates > .label:before { position: relative; + right: auto; + line-height: inherit; + margin-right: $interiorMargin; } } } .t-dialog-sm .overlay > .holder { - //@include test(blue); height: auto; max-height: 100%; } } diff --git a/platform/commonUI/general/res/sass/overlay/_overlay.scss b/platform/commonUI/general/res/sass/overlay/_overlay.scss index 2f2c2c452a..2c60aa99af 100644 --- a/platform/commonUI/general/res/sass/overlay/_overlay.scss +++ b/platform/commonUI/general/res/sass/overlay/_overlay.scss @@ -19,13 +19,22 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ + .overlay { font-size: 90%; + &.delayEntry100ms { + @include keyframes(fadeInFromNone) { + 0% { display: none; opacity: 0; } + 100% { display: block; opacity: 1; } + } + @include animation-delay($delayEntryMs); + @include animation(fadeInFromNone $durEntryMs ease-in); + } .blocker { background: $colorOvrBlocker; z-index: 100; } - .clk-icon.close { + .close { font-size: 0.8rem; position: absolute; top: $interiorMarginLg; @@ -87,7 +96,7 @@ .bottom-bar { text-align: right; - .s-btn { + .s-button { $bg: $colorOvrBtnBg; &:not(.major) { @include btnSubtle($bg, pullForward($bg, 10%), $colorOvrBtnFg, $colorOvrBtnFg); diff --git a/platform/commonUI/general/res/sass/search/_search.scss b/platform/commonUI/general/res/sass/search/_search.scss index 295b9dd07c..51c451147f 100644 --- a/platform/commonUI/general/res/sass/search/_search.scss +++ b/platform/commonUI/general/res/sass/search/_search.scss @@ -23,17 +23,9 @@ .clear-icon, .menu-icon { cursor: pointer; - font-family: symbolsfont; @include trans-prop-nice((opacity, color), 150ms); } -.clear-icon { - // 'x' in circle icon - &:before { - content: '\e607'; - } -} - .holder-search { $iconWidth: 20px; @@ -41,6 +33,7 @@ $textInputHeight: 19px; // This is equal to the default value, 19px $iconEdgeM: 4px; $iconD: $treeSearchInputBarH - ($iconEdgeM*2); + @extend .icon-magnify; font-size: 0.8em; position: relative; @@ -50,16 +43,17 @@ } &:before, - .clear-icon, + .clear-input, .menu-icon { + // :before is magnify glass icon box-sizing: border-box; color: $colorInputIcon; height: $iconD; width: $iconD; line-height: $iconD; - position: absolute; - text-align: center; - top: $iconEdgeM; + position: absolute; + text-align: center; + top: $iconEdgeM; } .search-input { @@ -76,8 +70,6 @@ &:before { // Magnify glass icon - content:'\4d'; - font-family: symbolsfont; left: $interiorMarginSm; @include trans-prop-nice(color, 250ms); pointer-events: none; @@ -89,7 +81,8 @@ color: pullForward($colorInputIcon, 10%); } - .clear-icon { + .clear-input { + // Hiding for now with addition of Cancel button right: $iconD + $interiorMargin; // Icon is visible only when there is text input @@ -107,12 +100,10 @@ .menu-icon { // 'v' invoke menu icon - &:before { content: '\76'; } font-size: 0.8em; padding-right: $iconEdgeM; right: $iconEdgeM; text-align: right; - &:hover { color: pullForward($colorInputIcon, 10%); } @@ -126,18 +117,22 @@ } } + .results-msg { + font-size: 0.8rem; + } + .active-filter-display { $s: 0.7em; $p: $interiorMargin; box-sizing: border-box; line-height: 130%; - padding-left: $s * 2.25; + padding-left: $s * 2; font-size: $s; - .clear-filters-icon { - color: $colorInputIcon; + .clear-filters { opacity: 1; - font-size: 0.8em; + font-size: 0.9em; + margin-right: $interiorMarginSm; position: absolute; left: 1px; cursor: pointer; diff --git a/platform/commonUI/general/res/sass/tree/_tree.scss b/platform/commonUI/general/res/sass/tree/_tree.scss index ed7f94fb11..fc92f17941 100644 --- a/platform/commonUI/general/res/sass/tree/_tree.scss +++ b/platform/commonUI/general/res/sass/tree/_tree.scss @@ -21,52 +21,57 @@ *****************************************************************************/ ul.tree { - @include menuUlReset(); - @include user-select(none); - li { - display: block; - position: relative; - } - ul.tree { - margin-left: $treeVCW + $interiorMargin; - } + @include menuUlReset(); + @include user-select(none); + li { + display: block; + position: relative; + } + ul.tree { + margin-left: $treeVCW + $interiorMargin; + } } .tree-item, .search-result-item { @extend .l-flex-row; - box-sizing: border-box; - border-radius: $basicCr; - @include transition(background-color, 0.25s); - font-size: 0.8rem; - height: $menuLineH; - line-height: $menuLineH; - margin-bottom: $interiorMarginSm; + box-sizing: border-box; + border-radius: $basicCr; + @include transition(background-color, 0.25s); + font-size: 0.8rem; + height: $menuLineH; + line-height: $menuLineH; + margin-bottom: $interiorMarginSm; padding: 0 $interiorMarginSm; - position: relative; + position: relative; - .view-control { - color: $colorItemTreeVC; + .flex-elem { + height: inherit !important; + line-height: inherit !important; + } + + .view-control { + color: $colorItemTreeVC; font-size: 0.75em; - margin-right: $interiorMargin; + margin-right: $interiorMargin; height: 100%; line-height: inherit; - width: $treeVCW; + width: $treeVCW; &.has-children { &:before { position: absolute; @include trans-prop-nice(transform, 100ms); - content: "\3e"; + content: "\e904"; @include transform-origin(center); } &.expanded:before { @include transform(rotate(90deg)); } } - } + } - .t-object-label { - line-height: $menuLineH; + .t-object-label { + line-height: $menuLineH; .t-item-icon { @include txtShdwSubtle($shdwItemTreeIcon); font-size: $treeTypeIconH; @@ -76,34 +81,34 @@ ul.tree { .t-title-label { @include ellipsize(); } - } + } - &.selected { - background: $colorItemTreeSelectedBg; - color: $colorItemTreeSelectedFg; - .view-control { - color: $colorItemTreeSelectedVC; - } - .t-object-label .t-item-icon { - color: $colorItemTreeSelectedFg; - } - } + &.selected { + background: $colorItemTreeSelectedBg !important; + color: $colorItemTreeSelectedFg !important; + .view-control { + color: $colorItemTreeSelectedVC; + } + .t-object-label .t-item-icon { + color: $colorItemTreeSelectedFg; + } + } - &:not(.loading) { - cursor: pointer; - } + &:not(.loading) { + cursor: pointer; + } - .context-trigger { - $h: 0.9rem; - top: -1px; - position: absolute; - right: $interiorMarginSm; - .invoke-menu { - font-size: 0.75em; - height: $h; - line-height: $h; - } - } + .context-trigger { + $h: 0.9rem; + top: -1px; + position: absolute; + right: $interiorMarginSm; + .invoke-menu { + font-size: 0.75em; + height: $h; + line-height: $h; + } + } } body.desktop { @@ -151,7 +156,7 @@ mct-representation { @extend .ui-symbol; @include pulse($dur: 1s, $opacity0: 0.25); color: $colorItemTreeEditingFg; - content: '\70'; + content: $glyph-icon-pencil; margin-right: $interiorMarginSm; } .t-object-label { @@ -164,6 +169,16 @@ mct-representation { font-style: italic; } } - .view-control, + .tree-item-subtree { display: none; } + .view-control, + .tree-item-subtree { + display: none; + } + + &.selected { + .t-title-label, + .t-item-icon, + &:before { + color: rgba($colorItemTreeSelectedFg, 0.5); + } + } } } diff --git a/platform/commonUI/general/res/sass/user-environ/_frame.scss b/platform/commonUI/general/res/sass/user-environ/_frame.scss index b4a9471649..eebf256633 100644 --- a/platform/commonUI/general/res/sass/user-environ/_frame.scss +++ b/platform/commonUI/general/res/sass/user-environ/_frame.scss @@ -49,8 +49,8 @@ left: $myM; } &.frame-template { - .s-btn, - .s-menu-btn { + .s-button, + .s-menu-button { height: $ohH; line-height: $ohH; padding: 0 $interiorMargin; @@ -60,7 +60,7 @@ } } - .s-menu-btn:after { + .s-menu-button:after { font-size: 8px; } diff --git a/platform/commonUI/general/res/sass/user-environ/_layout.scss b/platform/commonUI/general/res/sass/user-environ/_layout.scss index 431d835e24..9740171ff0 100644 --- a/platform/commonUI/general/res/sass/user-environ/_layout.scss +++ b/platform/commonUI/general/res/sass/user-environ/_layout.scss @@ -82,7 +82,7 @@ top: auto; height: $ueFooterH; line-height: $ueFooterH - ($interiorMargin * 2); - background: $colorFooterBg; + background: $colorStatusBarBg; color: lighten($colorBodyBg, 30%); font-size: .7rem; .status-holder { @@ -147,44 +147,40 @@ } body.desktop .pane .mini-tab-icon.toggle-pane { - $d: $uePaneMiniTabH; - $paneExpandedOffset: $splitterD + $uePaneMiniTabW; - top: $bodyMargin; - height: $d; - line-height: $d; - &:after { - // Always the icon that shows when the pane is collapsed - opacity: 0; + $hi: splitterHandleInset($splitterD, $splitterHandleD); + $paneExpandedOffset: $hi + $splitterHandleD + $uePaneMiniTabW; + top: $bodyMargin + ($ueTopBarH - $uePaneMiniTabH)/2; + + &.toggle-tree.anchor-left.collapsed, + &.toggle-inspect.anchor-right:not(.collapsed) { + @extend .icon-arrow-right; + border-bottom-right-radius: $controlCr; + border-top-right-radius: $controlCr; } - &.collapsed { - &:before { - opacity: 0; - } - &:after { - opacity: 1; - } + + &.toggle-tree.anchor-left:not(.collapsed), + &.toggle-inspect.anchor-right.collapsed { + @extend .icon-arrow-left; + border-bottom-left-radius: $controlCr; + border-top-left-radius: $controlCr; } + &.toggle-tree.anchor-left { left: 0; @include transform(translateX(-1 * $paneExpandedOffset)); - &:after { - content: '\6d'; // Menu 'hamburger' icon - } &.collapsed { - left: 0; - @include transform(translateX((-1 * $ueCollapsedPaneEdgeM) + $interiorMargin)); - } - &:not(.collapsed):before { - @include trans-prop-nice(opacity, 200ms, 200ms); + @include transform(translateX(-1 * $ueCollapsedPaneEdgeM)); } } + &.toggle-inspect.anchor-right { - right: $bodyMargin; - &:after { - content: '\e615'; // Eye icon + right: 0; + @include transform(translateX($paneExpandedOffset)); + &.flush-right { + @include transform(translateX(($uePaneMiniTabW + ceil($splitterD / 2)))); } &.collapsed { - right: $interiorMargin; + @include transform(translateX($ueCollapsedPaneEdgeM)); } } } @@ -196,11 +192,11 @@ body.desktop .pane .mini-tab-icon.toggle-pane { right: 0; bottom: $interiorMargin; left: $bodyMargin; - .create-btn-holder { + .create-button-holder { &.s-status-editing { display: none; & + .search-holder .search-bar { - // .search-holder is adjacent sibling to .create-btn-holder + // .search-holder is adjacent sibling to .create-button-holder // Add right margin when create button is hidden, to make room for the collapse pane 'x' button margin-right: $interiorMarginLg * 2; } @@ -220,7 +216,7 @@ body.desktop .pane .mini-tab-icon.toggle-pane { .holder-inspector { top: $bodyMargin; bottom: $interiorMargin; - left: $bodyMargin; + left: $bodyMargin + $interiorMargin; right: $bodyMargin; } .holder-elements { @@ -241,11 +237,11 @@ body.desktop .pane .mini-tab-icon.toggle-pane { @include trans-prop-nice-resize(0.25s); } -.object-browse-bar .s-btn, -.top-bar .buttons-main .s-btn, -.top-bar .s-menu-btn, -.tool-bar .s-btn, -.tool-bar .s-menu-btn { +.object-browse-bar .s-button, +.top-bar .buttons-main .s-button, +.top-bar .s-menu-button, +.tool-bar .s-button, +.tool-bar .s-menu-button { $h: $btnToolbarH; height: $h; line-height: $h; diff --git a/protractor/common/Launch.js b/platform/commonUI/general/res/sass/user-environ/_selecting.scss similarity index 72% rename from protractor/common/Launch.js rename to platform/commonUI/general/res/sass/user-environ/_selecting.scss index 75d3631cc4..e20a19872f 100644 --- a/protractor/common/Launch.js +++ b/platform/commonUI/general/res/sass/user-environ/_selecting.scss @@ -19,11 +19,21 @@ * this source code distribution or the Licensing information page available * at runtime from the About dialog for additional information. *****************************************************************************/ -/*global module,browser*/ +.s-selectable { + border: 1px solid transparent; -module.exports = function launch() { - 'use strict'; - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984'); - browser.sleep(2000); // 2 seconds -}; + &.s-hover { + // Styles when hovering over a selectable object + border-color: $colorSelectableHov !important; + } + + &.s-selected { + // Styles for a selected object. Also used by legacy Fixed Position/Panel objects. + border-color: $colorSelectableSelectedPrimary !important; + } + + &.s-moveable { + @include boxShdwLarge(); + cursor: move; + } +} \ No newline at end of file diff --git a/platform/commonUI/general/res/templates/controls/action-button.html b/platform/commonUI/general/res/templates/controls/action-button.html index ffb5816b51..eeaaa2613d 100644 --- a/platform/commonUI/general/res/templates/controls/action-button.html +++ b/platform/commonUI/general/res/templates/controls/action-button.html @@ -19,13 +19,10 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> - - - {{parameters.action.getMetadata().glyph}} - {{parameters.action.getMetadata().name}} diff --git a/platform/commonUI/general/res/templates/controls/input-filter.html b/platform/commonUI/general/res/templates/controls/input-filter.html index 67fbfd0245..a2a8c32aea 100644 --- a/platform/commonUI/general/res/templates/controls/input-filter.html +++ b/platform/commonUI/general/res/templates/controls/input-filter.html @@ -25,7 +25,7 @@ - diff --git a/platform/commonUI/general/res/templates/controls/selector.html b/platform/commonUI/general/res/templates/controls/selector.html index 3d522e2d6d..3a64cd3140 100644 --- a/platform/commonUI/general/res/templates/controls/selector.html +++ b/platform/commonUI/general/res/templates/controls/selector.html @@ -43,11 +43,11 @@
- > - < diff --git a/platform/commonUI/general/res/templates/controls/switcher.html b/platform/commonUI/general/res/templates/controls/switcher.html index 177f658517..9f6b0c5f8c 100644 --- a/platform/commonUI/general/res/templates/controls/switcher.html +++ b/platform/commonUI/general/res/templates/controls/switcher.html @@ -20,26 +20,20 @@ at runtime from the About dialog for additional information. --> -
+ ng-controller="ClickAwayController as toggle"> - - - {{ngModel.selected.glyph}} + title="{{ngModel.selected.name}}"> {{ngModel.selected.name}}
  • - {{option.glyph}} + ng-click="ngModel.selected = option; toggle.setState(false)" + class="{{option.cssclass}}"> {{option.name}}
diff --git a/platform/commonUI/general/res/templates/controls/time-controller.html b/platform/commonUI/general/res/templates/controls/time-controller.html index 523dcd66ad..5e85c2d9bc 100644 --- a/platform/commonUI/general/res/templates/controls/time-controller.html +++ b/platform/commonUI/general/res/templates/controls/time-controller.html @@ -22,7 +22,7 @@
- C + - - {{ngModel.getGlyph()}} - {{ngModel.getText()}} - G +
\ No newline at end of file diff --git a/platform/commonUI/general/res/templates/label.html b/platform/commonUI/general/res/templates/label.html index 2f626c60fe..90c9a7ebdc 100644 --- a/platform/commonUI/general/res/templates/label.html +++ b/platform/commonUI/general/res/templates/label.html @@ -20,8 +20,6 @@ at runtime from the About dialog for additional information. -->
-
-
{{type.getGlyph()}}
-
+
{{model.name}}
diff --git a/platform/commonUI/general/res/templates/menu/context-menu.html b/platform/commonUI/general/res/templates/menu/context-menu.html index f29e4d6f1d..5c245e5975 100644 --- a/platform/commonUI/general/res/templates/menu/context-menu.html +++ b/platform/commonUI/general/res/templates/menu/context-menu.html @@ -22,17 +22,12 @@
    -
  • - - {{menuAction.getMetadata().glyph}} - + class="{{menuAction.getMetadata().cssclass}}"> {{menuAction.getMetadata().name}}
    • -
\ No newline at end of file diff --git a/platform/commonUI/general/res/templates/message-banner.html b/platform/commonUI/general/res/templates/message-banner.html index 44c7f915b6..68e3c452dc 100644 --- a/platform/commonUI/general/res/templates/message-banner.html +++ b/platform/commonUI/general/res/templates/message-banner.html @@ -16,6 +16,5 @@ ng-click="action(active.notification.model.primaryOption.callback, $event)"> {{active.notification.model.primaryOption.label}} - +
\ No newline at end of file diff --git a/platform/commonUI/general/res/templates/tree/tree-label.html b/platform/commonUI/general/res/templates/tree/tree-label.html index 8c6dcb2e86..564784445c 100644 --- a/platform/commonUI/general/res/templates/tree/tree-label.html +++ b/platform/commonUI/general/res/templates/tree/tree-label.html @@ -1,8 +1,6 @@
-
-
-
+
diff --git a/platform/commonUI/general/src/controllers/ClickAwayController.js b/platform/commonUI/general/src/controllers/ClickAwayController.js index 94ae71c2ea..6a01c528e9 100644 --- a/platform/commonUI/general/src/controllers/ClickAwayController.js +++ b/platform/commonUI/general/src/controllers/ClickAwayController.js @@ -34,7 +34,7 @@ define( * @param $scope the scope in which this controller is active * @param $document the document element, injected by Angular */ - function ClickAwayController($document, $scope) { + function ClickAwayController($document, $timeout) { var self = this; this.state = false; @@ -44,7 +44,7 @@ define( // `clickaway` action occurs after `toggle` if `toggle` is // triggered by a click/mouseup. this.clickaway = function () { - $scope.$apply(function () { + $timeout(function () { self.deactivate(); }); }; diff --git a/platform/commonUI/general/src/controllers/ObjectInspectorController.js b/platform/commonUI/general/src/controllers/ObjectInspectorController.js index eb164dc76b..ef066d6774 100644 --- a/platform/commonUI/general/src/controllers/ObjectInspectorController.js +++ b/platform/commonUI/general/src/controllers/ObjectInspectorController.js @@ -38,7 +38,7 @@ define( $scope.contextutalParents = []; //$scope.isLink = false; - // Gets an array of the contextual parents/anscestors of the selected object + // Gets an array of the contextual parents/ancestors of the selected object function getContextualPath() { var currentObj = $scope.ngModel.selectedObject, currentParent, @@ -61,7 +61,7 @@ define( $scope.contextutalParents = parents; } - // Gets an array of the parents/anscestors of the selected object's + // Gets an array of the parents/ancestors of the selected object's // primary location (locational of original non-link) function getPrimaryPath(current) { var location; diff --git a/platform/commonUI/general/src/controllers/ToggleController.js b/platform/commonUI/general/src/controllers/ToggleController.js index 728d912c9a..8930c7fef2 100644 --- a/platform/commonUI/general/src/controllers/ToggleController.js +++ b/platform/commonUI/general/src/controllers/ToggleController.js @@ -33,6 +33,8 @@ define( */ function ToggleController() { this.state = false; + + this.setState = this.setState.bind(this); } /** diff --git a/platform/commonUI/general/src/directives/MCTTree.js b/platform/commonUI/general/src/directives/MCTTree.js index bb3bb3439e..3b08691125 100644 --- a/platform/commonUI/general/src/directives/MCTTree.js +++ b/platform/commonUI/general/src/directives/MCTTree.js @@ -24,20 +24,19 @@ define([ 'angular', '../ui/TreeView' ], function (angular, TreeView) { - function MCTTree($parse, gestureService) { - function link(scope, element, attrs) { + function MCTTree(gestureService) { + function link(scope, element) { var treeView = new TreeView(gestureService), - expr = $parse(attrs.mctModel), unobserve = treeView.observe(function (domainObject) { - if (domainObject !== expr(scope.$parent)) { - expr.assign(scope.$parent, domainObject); + if (scope.mctModel !== domainObject) { + scope.mctModel = domainObject; scope.$apply(); } }); element.append(angular.element(treeView.elements())); - scope.$parent.$watch(attrs.mctModel, treeView.value.bind(treeView)); + scope.$watch('mctModel', treeView.value.bind(treeView)); scope.$watch('mctObject', treeView.model.bind(treeView)); scope.$on('$destroy', unobserve); } @@ -45,7 +44,7 @@ define([ return { restrict: "E", link: link, - scope: { mctObject: "=" } + scope: { mctObject: "=", mctModel: "=" } }; } diff --git a/platform/commonUI/general/src/filters/ReverseFilter.js b/platform/commonUI/general/src/filters/ReverseFilter.js index a951e940e4..775d9fca86 100644 --- a/platform/commonUI/general/src/filters/ReverseFilter.js +++ b/platform/commonUI/general/src/filters/ReverseFilter.js @@ -25,7 +25,7 @@ define(function () { /** * Implements the `reverse` filter, which reverses text strings. * Useful in cases where text should be reversed for presentational - * reasons (e.g. in conjunction with CSS tricks involing text direction), + * reasons (e.g. in conjunction with CSS tricks involving text direction), * allowing such behavior to be handled independently from the controller * layer. * diff --git a/platform/commonUI/general/src/services/PopupService.js b/platform/commonUI/general/src/services/PopupService.js index b87c553ccd..3f65106fb0 100644 --- a/platform/commonUI/general/src/services/PopupService.js +++ b/platform/commonUI/general/src/services/PopupService.js @@ -35,7 +35,7 @@ define( } /** - * Options controlling how the popup is displaed. + * Options controlling how the popup is displayed. * * @typedef PopupOptions * @memberof platform/commonUI/general diff --git a/platform/commonUI/general/src/ui/TreeLabelView.js b/platform/commonUI/general/src/ui/TreeLabelView.js index 7d654f21f8..49ff2bdf5b 100644 --- a/platform/commonUI/general/src/ui/TreeLabelView.js +++ b/platform/commonUI/general/src/ui/TreeLabelView.js @@ -30,23 +30,22 @@ define([ this.gestureService = gestureService; } - function getGlyph(domainObject) { - var type = domainObject.getCapability('type'); - return type.getGlyph(); - } - function isLink(domainObject) { var location = domainObject.getCapability('location'); return location.isLink(); } + function getClass(domainObject) { + var type = domainObject.getCapability('type'); + return type.getCssClass(); + } + TreeLabelView.prototype.updateView = function (domainObject) { var titleEl = this.el.find('.t-title-label'), - glyphEl = this.el.find('.t-item-icon-glyph'), iconEl = this.el.find('.t-item-icon'); titleEl.text(domainObject ? domainObject.getModel().name : ""); - glyphEl.text(domainObject ? getGlyph(domainObject) : ""); + iconEl.addClass(domainObject ? getClass(domainObject) : ""); if (domainObject && isLink(domainObject)) { iconEl.addClass('l-icon-link'); diff --git a/platform/commonUI/general/test/controllers/BottomBarControllerSpec.js b/platform/commonUI/general/test/controllers/BottomBarControllerSpec.js index 50ac0ddfc7..898bec9c7f 100644 --- a/platform/commonUI/general/test/controllers/BottomBarControllerSpec.js +++ b/platform/commonUI/general/test/controllers/BottomBarControllerSpec.js @@ -35,7 +35,7 @@ define( beforeEach(function () { mockIndicator = jasmine.createSpyObj( "indicator", - ["getGlyph", "getText"] + ["getGlyph", "getCssClass", "getText"] ); testIndicatorA = {}; diff --git a/platform/commonUI/general/test/controllers/ClickAwayControllerSpec.js b/platform/commonUI/general/test/controllers/ClickAwayControllerSpec.js index 8edf90e2c6..8b114f9948 100644 --- a/platform/commonUI/general/test/controllers/ClickAwayControllerSpec.js +++ b/platform/commonUI/general/test/controllers/ClickAwayControllerSpec.js @@ -26,7 +26,7 @@ define( describe("The click-away controller", function () { var mockDocument, - mockScope, + mockTimeout, controller; beforeEach(function () { @@ -34,11 +34,10 @@ define( "$document", ["on", "off"] ); - mockScope = jasmine.createSpyObj('$scope', ['$apply']); - + mockTimeout = jasmine.createSpy('timeout'); controller = new ClickAwayController( mockDocument, - mockScope + mockTimeout ); }); @@ -61,7 +60,7 @@ define( expect(controller.isActive()).toBe(false); }); - it("allows active state to be explictly specified", function () { + it("allows active state to be explicitly specified", function () { controller.setState(true); expect(controller.isActive()).toBe(true); controller.setState(true); @@ -78,15 +77,18 @@ define( }); it("deactivates and detaches listener on document click", function () { - var callback, apply; + var callback, timeout; controller.setState(true); callback = mockDocument.on.mostRecentCall.args[1]; callback(); - apply = mockScope.$apply.mostRecentCall.args[0]; - apply(); + timeout = mockTimeout.mostRecentCall.args[0]; + timeout(); expect(controller.isActive()).toEqual(false); expect(mockDocument.off).toHaveBeenCalledWith("mouseup", callback); }); + + + }); } ); diff --git a/platform/commonUI/general/test/controllers/ToggleControllerSpec.js b/platform/commonUI/general/test/controllers/ToggleControllerSpec.js index 32a9568200..b51e2f0920 100644 --- a/platform/commonUI/general/test/controllers/ToggleControllerSpec.js +++ b/platform/commonUI/general/test/controllers/ToggleControllerSpec.js @@ -46,7 +46,7 @@ define( expect(controller.isActive()).toBe(false); }); - it("allows active state to be explictly specified", function () { + it("allows active state to be explicitly specified", function () { controller.setState(true); expect(controller.isActive()).toBe(true); controller.setState(true); diff --git a/platform/commonUI/general/test/directives/MCTTreeSpec.js b/platform/commonUI/general/test/directives/MCTTreeSpec.js index 11921c2625..bd8e17117a 100644 --- a/platform/commonUI/general/test/directives/MCTTreeSpec.js +++ b/platform/commonUI/general/test/directives/MCTTreeSpec.js @@ -29,6 +29,18 @@ define([ mockExpr, mctTree; + function makeMockDomainObject(id) { + var mockDomainObject = jasmine.createSpyObj('domainObject-' + id, [ + 'getId', + 'getModel', + 'getCapability', + 'hasCapability' + ]); + mockDomainObject.getId.andReturn(id); + mockDomainObject.getModel.andReturn({}); + return mockDomainObject; + } + beforeEach(function () { mockGestureService = jasmine.createSpyObj( 'gestureService', @@ -46,8 +58,8 @@ define([ expect(mctTree.restrict).toEqual("E"); }); - it("two-way binds to mctObject", function () { - expect(mctTree.scope).toEqual({ mctObject: "=" }); + it("two-way binds to mctObject and mctModel", function () { + expect(mctTree.scope).toEqual({ mctObject: "=", mctModel: "=" }); }); describe("link", function () { @@ -56,7 +68,8 @@ define([ testAttrs; beforeEach(function () { - mockScope = jasmine.createSpyObj('$scope', ['$watch', '$on']); + mockScope = + jasmine.createSpyObj('$scope', ['$watch', '$on', '$apply']); mockElement = jasmine.createSpyObj('element', ['append']); testAttrs = { mctModel: "some-expression" }; mockScope.$parent = @@ -69,8 +82,8 @@ define([ }); it("watches for mct-model's expression in the parent", function () { - expect(mockScope.$parent.$watch).toHaveBeenCalledWith( - testAttrs.mctModel, + expect(mockScope.$watch).toHaveBeenCalledWith( + "mctModel", jasmine.any(Function) ); }); @@ -88,6 +101,27 @@ define([ jasmine.any(Function) ); }); + + // https://github.com/nasa/openmct/issues/1114 + it("does not trigger $apply during $watches", function () { + mockScope.mctObject = makeMockDomainObject('root'); + mockScope.mctMode = makeMockDomainObject('selection'); + mockScope.$watch.calls.forEach(function (call) { + call.args[1](mockScope[call.args[0]]); + }); + expect(mockScope.$apply).not.toHaveBeenCalled(); + }); + it("does trigger $apply from other value changes", function () { + // White-boxy; we know this is the setter for the tree's value + var treeValueFn = mockScope.$watch.calls[0].args[1]; + + mockScope.mctObject = makeMockDomainObject('root'); + mockScope.mctMode = makeMockDomainObject('selection'); + + treeValueFn(makeMockDomainObject('other')); + + expect(mockScope.$apply).toHaveBeenCalled(); + }); }); }); diff --git a/platform/commonUI/general/test/ui/TreeViewSpec.js b/platform/commonUI/general/test/ui/TreeViewSpec.js index 9b267e5cda..4337bc5bcd 100644 --- a/platform/commonUI/general/test/ui/TreeViewSpec.js +++ b/platform/commonUI/general/test/ui/TreeViewSpec.js @@ -106,7 +106,7 @@ define([ return { context: jasmine.createSpyObj('context', ['getPath']), - type: jasmine.createSpyObj('type', ['getGlyph']), + type: jasmine.createSpyObj('type', ['getCssClass']), location: jasmine.createSpyObj('location', ['isLink']), mutation: jasmine.createSpyObj('mutation', ['listen']), status: mockStatus diff --git a/platform/commonUI/inspect/res/templates/info-button.html b/platform/commonUI/inspect/res/templates/info-button.html index cecd783a29..5c72f0cf74 100644 --- a/platform/commonUI/inspect/res/templates/info-button.html +++ b/platform/commonUI/inspect/res/templates/info-button.html @@ -21,4 +21,4 @@ --> - + diff --git a/platform/commonUI/inspect/src/InfoConstants.js b/platform/commonUI/inspect/src/InfoConstants.js index 3eb6df921d..959f475a94 100644 --- a/platform/commonUI/inspect/src/InfoConstants.js +++ b/platform/commonUI/inspect/src/InfoConstants.js @@ -29,8 +29,7 @@ define({ BUBBLE_TEMPLATE: "" + + "bubble-layout=\"{{bubbleLayout}}\">" + "" + "" + diff --git a/platform/commonUI/mobile/test/MCTDeviceSpec.js b/platform/commonUI/mobile/test/MCTDeviceSpec.js index 4d130c56ee..421d3d7aca 100644 --- a/platform/commonUI/mobile/test/MCTDeviceSpec.js +++ b/platform/commonUI/mobile/test/MCTDeviceSpec.js @@ -72,7 +72,7 @@ define( expect(directive.restrict).toEqual("A"); }); - it("transcludes at the elmeent level", function () { + it("transcludes at the element level", function () { expect(directive.transclude).toEqual('element'); }); diff --git a/platform/commonUI/notification/res/notification-indicator.html b/platform/commonUI/notification/res/notification-indicator.html index 2a2ec074df..95a1a32620 100644 --- a/platform/commonUI/notification/res/notification-indicator.html +++ b/platform/commonUI/notification/res/notification-indicator.html @@ -2,7 +2,7 @@ - + {{notifications.length}} Notifications {{notifications.length}} diff --git a/platform/commonUI/notification/src/NotificationService.js b/platform/commonUI/notification/src/NotificationService.js index 5412eb951e..e37571759a 100644 --- a/platform/commonUI/notification/src/NotificationService.js +++ b/platform/commonUI/notification/src/NotificationService.js @@ -361,7 +361,7 @@ define( autodismiss specified), leave it to run. Otherwise force a timeout. - This notifcation has been added to queue and will be + This notification has been added to queue and will be serviced as soon as possible. */ this.active.timeout = this.$timeout(function () { diff --git a/platform/commonUI/themes/espresso/res/sass/_constants.scss b/platform/commonUI/themes/espresso/res/sass/_constants.scss index 1c4087eaec..12c8d45ebf 100644 --- a/platform/commonUI/themes/espresso/res/sass/_constants.scss +++ b/platform/commonUI/themes/espresso/res/sass/_constants.scss @@ -2,10 +2,11 @@ $colorBodyBg: #333; $colorBodyFg: #999; $colorGenBg: #222; -$colorFooterBg: #000; +$colorStatusBarBg: #000; $colorKey: #0099cc; $colorKeySelectedBg: #005177; $colorKeyFg: #fff; +$colorKeyHov: #00c0f6; $colorEditAreaBg: #31363e; $colorEditAreaFg: #587ab5; $colorInteriorBorder: rgba($colorBodyFg, 0.1); @@ -21,11 +22,20 @@ $smallCr: 2px; $colorBtnBg: pullForward($colorBodyBg, $contrastRatioPercent); $colorBtnBgHov: pullForward($colorBtnBg, $hoverRatioPercent); $colorBtnFg: $colorBodyFg; +$colorBtnFgHov: pullForward($colorBtnFg, $hoverRatioPercent); +$colorBtnIcon: $colorBtnFg; +$colorBtnIconHov: $colorBtnFgHov; $colorBtnMajorBg: $colorKey; +$colorBtnMajorBgHov: pullForward($colorBtnMajorBg, $hoverRatioPercent); $colorBtnMajorFg: $colorKeyFg; -$colorBtnIcon: $colorKey; +$colorBtnMajorFgHov: pullForward($colorBtnMajorFg, $hoverRatioPercent); +$colorClickIcon: $colorKey; +$colorClickIconHov: $colorKeyHov; +$colorToggleIcon: rgba($colorBodyFg, 0.5); +$colorToggleIconActive: $colorKey; +$colorToggleIconHov: rgba($colorToggleIconActive, 0.5); $colorInvokeMenu: #fff; -$contrastInvokeMenuPercent: 20%; +$contrastInvokeMenuPercent: 30%; $shdwBtns: rgba(black, 0.2) 0 1px 2px; $shdwBtnsOverlay: rgba(black, 0.5) 0 1px 5px; $sliderColorBase: $colorKey; @@ -53,6 +63,9 @@ $colorInvokeMenu: #fff; $colorObjHdrTxt: $colorBodyFg; $colorObjHdrIc: pullForward($colorObjHdrTxt, 20%); $colorTick: rgba(white, 0.2); +$colorSelectableSelectedPrimary: $colorKey; +$colorSelectableSelectedSecondary: pushBack($colorSelectableSelectedPrimary, 20%); +$colorSelectableHov: $colorSelectableSelectedSecondary; // Menu colors $colorMenuBg: pullForward($colorBodyBg, 23%); @@ -168,7 +181,7 @@ $colorItemTreeSelectedBg: pushBack($colorKey, 15%); $colorItemTreeSelectedFg: pullForward($colorBodyFg, 20%); $colorItemTreeEditingBg: #344154; $colorItemTreeEditingFg: $colorEditAreaFg; -$colorItemTreeVC: $colorBodyFg; //rgba(#fff, 0.3); +$colorItemTreeVC: $colorBodyFg; $colorItemTreeVCHover: pullForward($colorItemTreeVC, 20%); $colorItemTreeSelectedVC: $colorItemTreeVC; $shdwItemTreeIcon: 0.6; @@ -177,23 +190,35 @@ $shdwItemTreeIcon: 0.6; $scrollbarTrackSize: 10px; $scrollbarTrackShdw: rgba(#000, 0.7) 0 1px 5px; $scrollbarTrackColorBg: rgba(#000, 0.4); -$scrollbarThumbColor: lighten($colorBodyBg, 10%); -$scrollbarThumbColorHov: lighten($scrollbarThumbColor, 2%); -$scrollbarThumbColorOverlay: lighten($colorOvrBg, 10%); -$scrollbarThumbColorOverlayHov: lighten($scrollbarThumbColorOverlay, 2%); +$scrollbarThumbColor: pullForward($colorBodyBg, 10%); +$scrollbarThumbColorHov: pullForward($scrollbarThumbColor, 2%); +$scrollbarThumbColorOverlay: pullForward($colorOvrBg, 10%); +$scrollbarThumbColorOverlayHov: pullForward($scrollbarThumbColorOverlay, 2%); // Splitter -$splitterD: 17px; // splitterD and $splitterHandleD should both be odd, or even -$splitterHandleD: 1px; -$splitterDSm: 17px; // Smaller splitter, used inside elements like a Timeline view -$colorSplitterBg: rgba(#fff, 0.1); //pullForward($colorBodyBg, 5%); +// All splitterD* values MUST both be either odd or even numbers +$splitterD: 20px; +$splitterDSm: 10px; // Smaller splitter, used inside elements like a Timeline view +$splitterHandleD: 2px; +$colorSplitterBaseBg: pullForward($colorBodyBg, 10%); +$colorSplitterBg: $colorSplitterBaseBg; $splitterShdw: rgba(black, 0.4) 0 0 3px; $splitterEndCr: none; -$colorSplitterHover: pullForward($colorBodyBg, 40%); +$colorSplitterHover: pullForward($colorSplitterBg, $hoverRatioPercent); $colorSplitterActive: $colorKey; +// Minitabs +$uePaneMiniTabH: 24px; +$uePaneMiniTabW: 8px; +$colorMiniTabBg: $colorSplitterBg; +$colorMiniTabFg: pushBack($colorMiniTabBg, 10%); +$colorMiniTabBgHov: $colorSplitterHover; +$colorMiniTabFgHov: #fff; + // Mobile $colorMobilePaneLeft: darken($colorBodyBg, 5%); +$colorMobilePaneLeftTreeItemBg: pullForward($colorMobilePaneLeft, 3%); +$colorMobileSelectListTreeItemBg: rgba(#fff, 0.05); // Datetime Picker $colorCalCellHovBg: $colorKey; diff --git a/platform/commonUI/themes/espresso/res/sass/_mixins.scss b/platform/commonUI/themes/espresso/res/sass/_mixins.scss index cfbe58dd66..f6a46b06c2 100644 --- a/platform/commonUI/themes/espresso/res/sass/_mixins.scss +++ b/platform/commonUI/themes/espresso/res/sass/_mixins.scss @@ -1,15 +1,9 @@ -@mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg, $hover: false) { +@mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg, $gradRatio: 5%) { @include containerBase($bg, $fg); - @include background-image(linear-gradient(lighten($bg, 5%), $bg)); + @include background-image(linear-gradient(pullForward($bg, $gradRatio), $bg)); @include boxShdw($shdwBtns); } -@mixin btnSubtle($bg: $colorBodyBg, $bgHovColor: none, $fg: $colorBodyFg, $ic: $colorBtnIcon) { - @include containerSubtle($bg, $fg); - @include btnBase($bg, $bgHovColor, $fg, $ic); - text-shadow: $shdwItemText; -} - @function pullForward($c: $colorBodyBg, $p: 20%) { // For dark interfaces, lighter things come forward - opposite for light interfaces @return lighten($c, $p); diff --git a/platform/commonUI/themes/snow/res/sass/_constants.scss b/platform/commonUI/themes/snow/res/sass/_constants.scss index 292358078a..f119559ba6 100644 --- a/platform/commonUI/themes/snow/res/sass/_constants.scss +++ b/platform/commonUI/themes/snow/res/sass/_constants.scss @@ -2,12 +2,13 @@ $colorBodyBg: #fcfcfc; $colorBodyFg: #666; $colorGenBg: #fff; -$colorFooterBg: #000; +$colorStatusBarBg: #000; $colorKey: #0099cc; $colorKeySelectedBg: $colorKey; $colorKeyFg: #fff; +$colorKeyHov: #00c0f6; $colorEditAreaBg: #eafaff; -$colorEditAreaFg: #4bb1c7; //587ab5; +$colorEditAreaFg: #4bb1c7; $colorInteriorBorder: rgba($colorBodyFg, 0.2); $colorA: #999; $colorAHov: $colorKey; @@ -21,9 +22,18 @@ $smallCr: 3px; $colorBtnBg: pullForward($colorBodyBg, $contrastRatioPercent); $colorBtnBgHov: pullForward($colorBtnBg, $hoverRatioPercent); $colorBtnFg: #fff; -$colorBtnMajorBg: $colorKey; -$colorBtnMajorFg: $colorKeyFg; +$colorBtnFgHov: $colorBtnFg; $colorBtnIcon: #eee; +$colorBtnIconHov: $colorBtnFgHov; +$colorBtnMajorBg: $colorKey; +$colorBtnMajorBgHov: $colorKeyHov; +$colorBtnMajorFg: $colorKeyFg; +$colorBtnMajorFgHov: pushBack($colorBtnMajorFg, $hoverRatioPercent); +$colorClickIcon: $colorKey; +$colorClickIconHov: $colorKeyHov; +$colorToggleIcon: rgba($colorClickIcon, 0.5); +$colorToggleIconActive: $colorKey; +$colorToggleIconHov: rgba($colorToggleIconActive, 0.5); $colorInvokeMenu: #000; $contrastInvokeMenuPercent: 40%; $shdwBtns: none; @@ -53,6 +63,9 @@ $colorInvokeMenu: #fff; $colorObjHdrTxt: $colorBodyFg; $colorObjHdrIc: pushBack($colorObjHdrTxt, 30%); $colorTick: rgba(black, 0.2); +$colorSelectableSelectedPrimary: $colorKey; +$colorSelectableSelectedSecondary: pushBack($colorSelectableSelectedPrimary, 20%); +$colorSelectableHov: $colorSelectableSelectedSecondary; // Menu colors $colorMenuBg: pushBack($colorBodyBg, 10%); @@ -105,8 +118,8 @@ $progressBarStripeW: 20px; $shdwStatusIc: rgba(white, 0.8) 0 0px 5px; // Selects -$colorSelectBg: #ddd; -$colorSelectFg: $colorBodyFg; +$colorSelectBg: $colorBtnBg; +$colorSelectFg: $colorBtnFg; // Limits and staleness colors// $colorTelemFresh: pullForward($colorBodyFg, 20%); @@ -133,7 +146,7 @@ $colorFieldHintOverlay: pullForward($colorOvrBg, 40%); // Items $colorItemBg: #ddd; -$colorItemBgHov: pullForward($colorItemBg, $hoverRatioPercent); +$colorItemBgHov: pullForward($colorItemBg, $hoverRatioPercent * 0.7); $colorItemFg: $colorBodyFg; $colorItemFgDetails: pushBack($colorItemFg, 15%); $colorItemIc: $colorKey; @@ -183,16 +196,29 @@ $scrollbarThumbColorOverlay: darken($colorOvrBg, 50%); $scrollbarThumbColorOverlayHov: $scrollbarThumbColorHov; // Splitter -$splitterD: 16px; // splitterD and $splitterHandleD should both be odd, or even +// All splitterD* values MUST both be either odd or even numbers +$splitterD: 16px; +$splitterDSm: 10px; // Smaller splitter, used inside elements like a Timeline view $splitterHandleD: 2px; -$colorSplitterBg: pullForward($colorBodyBg, 10%); +$colorSplitterBaseBg: $colorBodyBg; +$colorSplitterBg: pullForward($colorSplitterBaseBg, 15%); $splitterShdw: none; $splitterEndCr: none; -$colorSplitterHover: pullForward($colorBodyBg, 30%); +$colorSplitterHover: pullForward($colorSplitterBg, $hoverRatioPercent * 2); $colorSplitterActive: $colorKey; +// Minitabs +$uePaneMiniTabH: 24px; +$uePaneMiniTabW: 8px; +$colorMiniTabBg: $colorSplitterBg; +$colorMiniTabFg: pullForward($colorMiniTabBg, 30%); +$colorMiniTabBgHov: $colorSplitterHover; +$colorMiniTabFgHov: #fff; + // Mobile $colorMobilePaneLeft: darken($colorBodyBg, 2%); +$colorMobilePaneLeftTreeItemBg: pullForward($colorMobilePaneLeft, 3%); +$colorMobileSelectListTreeItemBg: rgba(#000, 0.05); // Datetime Picker, Calendar $colorCalCellHovBg: $colorKey; @@ -206,4 +232,4 @@ $colorAboutLink: #84b3ff; // Loading $colorLoadingFg: $colorAlt1; -$colorLoadingBg: rgba($colorLoadingFg, 0.1); +$colorLoadingBg: rgba($colorLoadingFg, 0.1); \ No newline at end of file diff --git a/platform/commonUI/themes/snow/res/sass/_controls.scss b/platform/commonUI/themes/snow/res/sass/_controls.scss index 4ff28bbfaa..3b247d7670 100644 --- a/platform/commonUI/themes/snow/res/sass/_controls.scss +++ b/platform/commonUI/themes/snow/res/sass/_controls.scss @@ -1,4 +1,4 @@ -.s-btn { +.s-button { &.major { .title-label { text-transform: uppercase; diff --git a/platform/commonUI/themes/snow/res/sass/_mixins.scss b/platform/commonUI/themes/snow/res/sass/_mixins.scss index 34f6462d41..a79405b166 100644 --- a/platform/commonUI/themes/snow/res/sass/_mixins.scss +++ b/platform/commonUI/themes/snow/res/sass/_mixins.scss @@ -1,14 +1,8 @@ -@mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg, $hover: false) { +@mixin containerSubtle($bg: $colorBodyBg, $fg: $colorBodyFg, $gradRatio: 5%) { @include containerBase($bg, $fg); @include boxShdw($shdwBtns); } -@mixin btnSubtle($bg: $colorBtnBg, $bgHovColor: none, $fg: $colorBtnFg, $ic: $colorBtnIcon) { - @include containerSubtle($bg, $fg); - @include btnBase($bg, $bgHovColor, $fg, $ic); - text-shadow: $shdwItemText; -} - @function pullForward($c: $colorBodyBg, $p: 20%) { // For dark interfaces, lighter things come forward - opposite for light interfaces @return darken($c, $p); diff --git a/platform/containment/test/CapabilityTableSpec.js b/platform/containment/test/CapabilityTableSpec.js index 851ac2f99f..646ef82882 100644 --- a/platform/containment/test/CapabilityTableSpec.js +++ b/platform/containment/test/CapabilityTableSpec.js @@ -45,7 +45,7 @@ define( ['getKey', 'getDefinition', 'getInitialModel'] ); mockType.getKey.andReturn(type); - // Return a model to drive apparant capabilities + // Return a model to drive apparent capabilities mockType.getInitialModel.andReturn({ id: type }); return mockType; }); diff --git a/platform/containment/test/ContainmentTableSpec.js b/platform/containment/test/ContainmentTableSpec.js index d0ab71b459..a83d9c1c82 100644 --- a/platform/containment/test/ContainmentTableSpec.js +++ b/platform/containment/test/ContainmentTableSpec.js @@ -50,7 +50,7 @@ define( // third one defines no containership rules contains: (index < 2) ? [{ has: 'b' }] : undefined }); - // Return a model to drive apparant capabilities + // Return a model to drive apparent capabilities mockType.getInitialModel.andReturn({ id: type }); return mockType; }); diff --git a/platform/core/bundle.js b/platform/core/bundle.js index f340b8cbe1..26a49e16d9 100644 --- a/platform/core/bundle.js +++ b/platform/core/bundle.js @@ -254,18 +254,26 @@ define([ "pattern": "\\S+", "required": true, "cssclass": "l-input-lg" + }, + { + "name": "Notes", + "key": "notes", + "property": "notes", + "control": "textarea", + "required": false, + "cssclass": "l-textarea-sm" } ] }, { "key": "root", "name": "Root", - "glyph": "\u0046" + "cssclass": "icon-folder" }, { "key": "folder", "name": "Folder", - "glyph": "\u0046", + "cssclass": "icon-folder", "features": "creation", "description": "Create folders to organize other objects or links to objects.", "priority": 1000, @@ -276,11 +284,11 @@ define([ { "key": "unknown", "name": "Unknown Type", - "glyph": "\u003f" + "cssclass": "icon-object-unknown" }, { "name": "Unknown Type", - "glyph": "\u003f" + "cssclass": "icon-object-unknown" } ], "capabilities": [ diff --git a/platform/core/src/actions/ActionAggregator.js b/platform/core/src/actions/ActionAggregator.js index 009975dadd..db21a7be52 100644 --- a/platform/core/src/actions/ActionAggregator.js +++ b/platform/core/src/actions/ActionAggregator.js @@ -58,7 +58,7 @@ define( * @property {string} key machine-readable identifier for this action * @property {string} name human-readable name for this action * @property {string} description human-readable description - * @property {string} glyph character to display as icon + * @property {string} cssclass CSS class for icon * @property {ActionContext} context the context in which the action * will be performed. */ diff --git a/platform/core/src/models/ModelCacheService.js b/platform/core/src/models/ModelCacheService.js index a204ef0b87..783509a774 100644 --- a/platform/core/src/models/ModelCacheService.js +++ b/platform/core/src/models/ModelCacheService.js @@ -24,7 +24,7 @@ define([], function () { /** * Provides a cache for domain object models which exist in memory, - * but may or may not exist in backing persistene stores. + * but may or may not exist in backing persistence stores. * @constructor * @memberof platform/core */ diff --git a/platform/core/src/models/RootModelProvider.js b/platform/core/src/models/RootModelProvider.js index 0dfb656c31..205d41e66b 100644 --- a/platform/core/src/models/RootModelProvider.js +++ b/platform/core/src/models/RootModelProvider.js @@ -42,7 +42,7 @@ define( * @implements {ModelService} * @param {Array} roots all `roots[]` extensions * @param $q Angular's $q, for promises - * @param $log Anuglar's $log, for logging + * @param $log Angular's $log, for logging */ function RootModelProvider(roots, $q, $log) { // Pull out identifiers to used as ROOT's diff --git a/platform/core/src/models/StaticModelProvider.js b/platform/core/src/models/StaticModelProvider.js index 45d89dbe2f..e20f9232fb 100644 --- a/platform/core/src/models/StaticModelProvider.js +++ b/platform/core/src/models/StaticModelProvider.js @@ -49,7 +49,7 @@ define( } } - // Prepoulate maps with models to make subsequent lookup faster. + // Prepopulate maps with models to make subsequent lookup faster. models.forEach(addModelToMap); this.modelMap = modelMap; diff --git a/platform/core/src/types/TypeImpl.js b/platform/core/src/types/TypeImpl.js index 5226ece852..5e032917a0 100644 --- a/platform/core/src/types/TypeImpl.js +++ b/platform/core/src/types/TypeImpl.js @@ -56,13 +56,13 @@ define( * @method Type#getDescription */ /** - * Get the glyph associated with this type. Glyphs are - * single-character strings which will appear as icons (when + * Get the cssclass associated with this type. cssclass is a + * string which will appear as an icon (when * displayed in an appropriate font) which visually * distinguish types from one another. * - * @returns {string} the glyph to be displayed - * @method Type#getGlyph + * @returns {string} the cssclass for this type + * @method Type#getCssClass */ /** * Get an array of properties associated with objects of @@ -144,8 +144,8 @@ define( return this.typeDef.description; }; - TypeImpl.prototype.getGlyph = function () { - return this.typeDef.glyph; + TypeImpl.prototype.getCssClass = function () { + return this.typeDef.cssclass; }; TypeImpl.prototype.getProperties = function () { diff --git a/platform/core/src/types/TypePropertyConversion.js b/platform/core/src/types/TypePropertyConversion.js index 84fba54e02..fcf71b2011 100644 --- a/platform/core/src/types/TypePropertyConversion.js +++ b/platform/core/src/types/TypePropertyConversion.js @@ -43,7 +43,7 @@ define( }, ARRAY_SUFFIX = '[]'; - // Utility function to handle arrays of conversiions + // Utility function to handle arrays of conversions function ArrayConversion(conversion) { return { toModelValue: function (formValue) { diff --git a/platform/core/src/types/TypeProvider.js b/platform/core/src/types/TypeProvider.js index c3256c57ba..e8cf83f3e2 100644 --- a/platform/core/src/types/TypeProvider.js +++ b/platform/core/src/types/TypeProvider.js @@ -68,7 +68,7 @@ define( }) : array; } - // Reduce an array of type definitions to a single type definiton, + // Reduce an array of type definitions to a single type definition, // which has merged all properties in order. function collapse(typeDefs) { var collapsed = typeDefs.reduce(function (a, b) { diff --git a/platform/core/src/views/ViewProvider.js b/platform/core/src/views/ViewProvider.js index a388f187b5..99ab0fc6ed 100644 --- a/platform/core/src/views/ViewProvider.js +++ b/platform/core/src/views/ViewProvider.js @@ -61,7 +61,7 @@ define( * domain object's whose `type` capability matches or inherits * from that type. * - * Views themselves are primarily metadata, such as name, glyph, and + * Views themselves are primarily metadata, such as name, icon and * description (to be shown in the UI); they do not contain any * information directly applicable to rendering to the DOM, although * they do contain sufficient information (such as a `templateUrl`, diff --git a/platform/core/test/types/TypeImplSpec.js b/platform/core/test/types/TypeImplSpec.js index caf45c5465..60b6c101e3 100644 --- a/platform/core/test/types/TypeImplSpec.js +++ b/platform/core/test/types/TypeImplSpec.js @@ -33,7 +33,7 @@ define( key: 'test-type', name: 'Test Type', description: 'A type, for testing', - glyph: 't', + cssclass: 'icon-telemetry-panel', inherits: ['test-parent-1', 'test-parent-2'], features: ['test-feature-1'], properties: [{}], @@ -54,8 +54,8 @@ define( expect(type.getDescription()).toEqual('A type, for testing'); }); - it("exposes glyph from definition", function () { - expect(type.getGlyph()).toEqual('t'); + it("exposes CSS class from definition", function () { + expect(type.getCssClass()).toEqual('icon-telemetry-panel'); }); it("exposes its underlying type definition", function () { diff --git a/platform/core/test/types/TypeProviderSpec.js b/platform/core/test/types/TypeProviderSpec.js index 7c04845fc9..c6a3225aff 100644 --- a/platform/core/test/types/TypeProviderSpec.js +++ b/platform/core/test/types/TypeProviderSpec.js @@ -30,18 +30,18 @@ define( testTypeDefinitions = [ { key: 'basic', - glyph: "X", + cssclass: "icon-magnify-in", name: "Basic Type" }, { key: 'multi1', - glyph: "Z", + cssclass: "icon-trash", description: "Multi1 Description", capabilities: ['a1', 'b1'] }, { key: 'multi2', - glyph: "Y", + cssclass: "icon-magnify-out", capabilities: ['a2', 'b2', 'c2'] }, { @@ -70,7 +70,7 @@ define( it("looks up non-inherited types by name", function () { captured.type = provider.getType('basic'); - expect(captured.type.getGlyph()).toEqual("X"); + expect(captured.type.getCssClass()).toEqual("icon-magnify-in"); expect(captured.type.getName()).toEqual("Basic Type"); expect(captured.type.getDescription()).toBeUndefined(); }); @@ -78,7 +78,7 @@ define( it("supports single inheritance", function () { captured.type = provider.getType('single-subtype'); - expect(captured.type.getGlyph()).toEqual("X"); + expect(captured.type.getCssClass()).toEqual("icon-magnify-in"); expect(captured.type.getName()).toEqual("Basic Subtype"); expect(captured.type.getDescription()).toEqual("A test subtype"); }); @@ -86,7 +86,7 @@ define( it("supports multiple inheritance", function () { captured.type = provider.getType('multi-subtype'); - expect(captured.type.getGlyph()).toEqual("Y"); + expect(captured.type.getCssClass()).toEqual("icon-magnify-out"); expect(captured.type.getName()).toEqual("Multi-parent Subtype"); expect(captured.type.getDescription()).toEqual("Multi1 Description"); }); diff --git a/platform/entanglement/README.md b/platform/entanglement/README.md index f3685bad05..aaf517decf 100644 --- a/platform/entanglement/README.md +++ b/platform/entanglement/README.md @@ -3,7 +3,7 @@ Entanglement is the process of moving, copying, and linking domain objects in such a way that their relationships are impossible to discern. -This bundle provides move, copy, and link functionality. Acheiving a state of +This bundle provides move, copy, and link functionality. Achieving a state of entanglement is left up to the end user. diff --git a/platform/entanglement/bundle.js b/platform/entanglement/bundle.js index ae10733cb1..1835fec43c 100644 --- a/platform/entanglement/bundle.js +++ b/platform/entanglement/bundle.js @@ -66,7 +66,7 @@ define([ "key": "move", "name": "Move", "description": "Move object to another location.", - "glyph": "f", + "cssclass": "icon-move", "category": "contextual", "implementation": MoveAction, "depends": [ @@ -79,7 +79,7 @@ define([ "key": "copy", "name": "Duplicate", "description": "Duplicate object to another location.", - "glyph": "+", + "cssclass": "icon-duplicate", "category": "contextual", "implementation": CopyAction, "depends": [ @@ -95,7 +95,7 @@ define([ "key": "link", "name": "Create Link", "description": "Create Link to object in another location.", - "glyph": "è", + "cssclass": "icon-link", "category": "contextual", "implementation": LinkAction, "depends": [ @@ -108,7 +108,7 @@ define([ "key": "follow", "name": "Go To Original", "description": "Go to the original, un-linked instance of this object.", - "glyph": "ô", + "cssclass": "", "category": "contextual", "implementation": GoToOriginalAction }, @@ -116,7 +116,7 @@ define([ "key": "locate", "name": "Set Primary Location", "description": "Set a domain object's primary location.", - "glyph": "", + "cssclass": "", "category": "contextual", "implementation": SetPrimaryLocationAction } diff --git a/platform/entanglement/src/actions/AbstractComposeAction.js b/platform/entanglement/src/actions/AbstractComposeAction.js index 3b43d568d9..943c2adb0a 100644 --- a/platform/entanglement/src/actions/AbstractComposeAction.js +++ b/platform/entanglement/src/actions/AbstractComposeAction.js @@ -95,7 +95,7 @@ define( this.locationService = locationService; this.composeService = composeService; this.verb = verb || "Compose"; - this.suffix = suffix || "to a new location"; + this.suffix = suffix || "To a New Location"; } AbstractComposeAction.prototype.cloneContext = function () { diff --git a/platform/entanglement/src/actions/CopyAction.js b/platform/entanglement/src/actions/CopyAction.js index 805b5f48ba..6388c25b74 100644 --- a/platform/entanglement/src/actions/CopyAction.js +++ b/platform/entanglement/src/actions/CopyAction.js @@ -54,7 +54,7 @@ define( copyService, context, "Duplicate", - "to a location" + "To a Location" ); } diff --git a/platform/entanglement/src/services/LocationService.js b/platform/entanglement/src/services/LocationService.js index 4ecf5d982b..7cb92265f5 100644 --- a/platform/entanglement/src/services/LocationService.js +++ b/platform/entanglement/src/services/LocationService.js @@ -58,6 +58,7 @@ define( sections: [ { name: 'Location', + cssclass: "grows", rows: [ { name: label, diff --git a/platform/entanglement/test/actions/AbstractComposeActionSpec.js b/platform/entanglement/test/actions/AbstractComposeActionSpec.js index cc7e59bc09..80fde42748 100644 --- a/platform/entanglement/test/actions/AbstractComposeActionSpec.js +++ b/platform/entanglement/test/actions/AbstractComposeActionSpec.js @@ -150,7 +150,7 @@ define( it("prompts for location", function () { expect(locationService.getLocationFromUser) .toHaveBeenCalledWith( - "Compose selectedObject to a new location", + "Compose selectedObject To a New Location", "Compose To", jasmine.any(Function), currentParent diff --git a/platform/entanglement/test/actions/CopyActionSpec.js b/platform/entanglement/test/actions/CopyActionSpec.js index a626268440..380d5ebd18 100644 --- a/platform/entanglement/test/actions/CopyActionSpec.js +++ b/platform/entanglement/test/actions/CopyActionSpec.js @@ -173,7 +173,7 @@ define( it("prompts for location", function () { expect(locationService.getLocationFromUser) .toHaveBeenCalledWith( - "Duplicate selectedObject to a location", + "Duplicate selectedObject To a Location", "Duplicate To", jasmine.any(Function), currentParent diff --git a/platform/entanglement/test/actions/LinkActionSpec.js b/platform/entanglement/test/actions/LinkActionSpec.js index c04e14f2a4..f7930bf0dd 100644 --- a/platform/entanglement/test/actions/LinkActionSpec.js +++ b/platform/entanglement/test/actions/LinkActionSpec.js @@ -126,7 +126,7 @@ define( it("prompts for location", function () { expect(locationService.getLocationFromUser) .toHaveBeenCalledWith( - "Link selectedObject to a new location", + "Link selectedObject To a New Location", "Link To", jasmine.any(Function), currentParent diff --git a/platform/entanglement/test/actions/MoveActionSpec.js b/platform/entanglement/test/actions/MoveActionSpec.js index 7226ecb2ec..bc5398d599 100644 --- a/platform/entanglement/test/actions/MoveActionSpec.js +++ b/platform/entanglement/test/actions/MoveActionSpec.js @@ -126,7 +126,7 @@ define( it("prompts for location", function () { expect(locationService.getLocationFromUser) .toHaveBeenCalledWith( - "Move selectedObject to a new location", + "Move selectedObject To a New Location", "Move To", jasmine.any(Function), currentParent diff --git a/platform/features/clock/bundle.js b/platform/features/clock/bundle.js index b29d8751ed..5699527e36 100644 --- a/platform/features/clock/bundle.js +++ b/platform/features/clock/bundle.js @@ -136,7 +136,7 @@ define([ ], "category": "contextual", "name": "Start", - "glyph": "ï", + "cssclass": "icon-play", "priority": "preferred" }, { @@ -147,7 +147,7 @@ define([ ], "category": "contextual", "name": "Restart at 0", - "glyph": "r", + "cssclass": "icon-refresh", "priority": "preferred" } ], @@ -155,7 +155,7 @@ define([ { "key": "clock", "name": "Clock", - "glyph": "\u0043", + "cssclass": "icon-clock", "description": "A UTC-based clock that supports a variety of display formats. Clocks can be added to Display Layouts.", "priority": 101, "features": [ @@ -212,7 +212,7 @@ define([ { "key": "timer", "name": "Timer", - "glyph": "\u00f5", + "cssclass": "icon-timer", "description": "A timer that counts up or down to a datetime. Timers can be started, stopped and reset whenever needed, and support a variety of display formats. Each Timer displays the same value to all users. Timers can be added to Display Layouts.", "priority": 100, "features": [ diff --git a/platform/features/clock/res/templates/timer.html b/platform/features/clock/res/templates/timer.html index 88f8979e21..411012bac1 100644 --- a/platform/features/clock/res/templates/timer.html +++ b/platform/features/clock/res/templates/timer.html @@ -21,20 +21,13 @@ -->
- - {{timer.buttonGlyph()}} - - - {{timer.sign()}} - {{timer.text() || "--:--:--"}} - + class="flex-elem control s-icon-button {{timer.buttonCssClass()}}"> + + {{timer.text() || "--:--:--"}} +
diff --git a/platform/features/clock/src/controllers/TimerController.js b/platform/features/clock/src/controllers/TimerController.js index ae306ce3d8..a95ff3d6a4 100644 --- a/platform/features/clock/src/controllers/TimerController.js +++ b/platform/features/clock/src/controllers/TimerController.js @@ -50,10 +50,13 @@ define( if (formatter && !isNaN(timeDelta)) { self.textValue = formatter(timeDelta); self.signValue = timeDelta < 0 ? "-" : - timeDelta >= 1000 ? "+" : ""; + timeDelta >= 1000 ? "+" : ""; + self.signCssClass = timeDelta < 0 ? "icon-minus" : + timeDelta >= 1000 ? "icon-plus" : ""; } else { self.textValue = ""; self.signValue = ""; + self.signCssClass = ""; } } @@ -126,12 +129,13 @@ define( } /** - * Get the glyph to display for the start/restart button. - * @returns {string} glyph to display + * Get the CSS class to display the right icon + * for the start/restart button. + * @returns {string} cssclass to display */ - TimerController.prototype.buttonGlyph = function () { + TimerController.prototype.buttonCssClass = function () { return this.relevantAction ? - this.relevantAction.getMetadata().glyph : ""; + this.relevantAction.getMetadata().cssclass : ""; }; /** @@ -164,6 +168,15 @@ define( return this.signValue; }; + /** + * Get the sign (+ or -) of the current timer value, as + * a CSS class. + * @returns {string} sign of the current timer value + */ + TimerController.prototype.signClass = function () { + return this.signCssClass; + }; + /** * Get the text to display for the current timer value. * @returns {string} current timer value diff --git a/platform/features/clock/src/indicators/ClockIndicator.js b/platform/features/clock/src/indicators/ClockIndicator.js index f8721ca87e..35ea9448b3 100644 --- a/platform/features/clock/src/indicators/ClockIndicator.js +++ b/platform/features/clock/src/indicators/ClockIndicator.js @@ -44,12 +44,12 @@ define( }); } - ClockIndicator.prototype.getGlyph = function () { - return "C"; + ClockIndicator.prototype.getGlyphClass = function () { + return "no-collapse float-right subdued"; }; - ClockIndicator.prototype.getGlyphClass = function () { - return "no-icon no-collapse float-right subtle"; + ClockIndicator.prototype.getCssClass = function () { + return "icon-clock"; }; ClockIndicator.prototype.getText = function () { diff --git a/platform/features/clock/test/controllers/TimerControllerSpec.js b/platform/features/clock/test/controllers/TimerControllerSpec.js index 5c84b5aed3..89fb0a4afc 100644 --- a/platform/features/clock/test/controllers/TimerControllerSpec.js +++ b/platform/features/clock/test/controllers/TimerControllerSpec.js @@ -85,8 +85,8 @@ define( 'timer.restart': mockRestart }[k]]; }); - mockStart.getMetadata.andReturn({ glyph: "S", name: "Start" }); - mockRestart.getMetadata.andReturn({ glyph: "R", name: "Restart" }); + mockStart.getMetadata.andReturn({ cssclass: "icon-play", name: "Start" }); + mockRestart.getMetadata.andReturn({ cssclass: "icon-refresh", name: "Restart" }); mockScope.domainObject = mockDomainObject; testModel = {}; @@ -144,14 +144,14 @@ define( expect(controller.text()).toEqual("0D 00:00:00"); }); - it("shows glyph & name for the applicable start/restart action", function () { + it("shows cssclass & name for the applicable start/restart action", function () { invokeWatch('domainObject', mockDomainObject); - expect(controller.buttonGlyph()).toEqual("S"); + expect(controller.buttonCssClass()).toEqual("icon-play"); expect(controller.buttonText()).toEqual("Start"); testModel.timestamp = 12321; invokeWatch('model.modified', 1); - expect(controller.buttonGlyph()).toEqual("R"); + expect(controller.buttonCssClass()).toEqual("icon-refresh"); expect(controller.buttonText()).toEqual("Restart"); }); diff --git a/platform/features/clock/test/indicators/ClockIndicatorSpec.js b/platform/features/clock/test/indicators/ClockIndicatorSpec.js index 7918e9fe35..6c9a8c2977 100644 --- a/platform/features/clock/test/indicators/ClockIndicatorSpec.js +++ b/platform/features/clock/test/indicators/ClockIndicatorSpec.js @@ -48,8 +48,7 @@ define( }); it("implements the Indicator interface", function () { - expect(indicator.getGlyph()).toEqual(jasmine.any(String)); - expect(indicator.getGlyphClass()).toEqual(jasmine.any(String)); + expect(indicator.getCssClass()).toEqual(jasmine.any(String)); expect(indicator.getText()).toEqual(jasmine.any(String)); expect(indicator.getDescription()).toEqual(jasmine.any(String)); }); diff --git a/platform/features/fixed/bundle.js b/platform/features/fixed/bundle.js index 121501588b..e2e40ff511 100644 --- a/platform/features/fixed/bundle.js +++ b/platform/features/fixed/bundle.js @@ -36,7 +36,7 @@ define([ { "key": "fixed-display", "name": "Fixed Position Display", - "glyph": "3", + "cssclass": "icon-box-with-dashed-lines", "type": "telemetry.fixed", "template": fixedTemplate, "uses": [ @@ -49,28 +49,28 @@ define([ "items": [ { "method": "add", - "glyph": "\u002b", + "cssclass": "icon-plus", "control": "menu-button", "text": "Add", "options": [ { "name": "Box", - "glyph": "\u00e0", + "cssclass": "icon-box", "key": "fixed.box" }, { "name": "Line", - "glyph": "\u00e2", + "cssclass": "icon-line-horz", "key": "fixed.line" }, { "name": "Text", - "glyph": "\u00e4", + "cssclass": "icon-T", "key": "fixed.text" }, { "name": "Image", - "glyph": "\u00e3", + "cssclass": "icon-image", "key": "fixed.image" } ] @@ -81,63 +81,74 @@ define([ "items": [ { "method": "order", - "glyph": "á", + "cssclass": "icon-layers", "control": "menu-button", + "title": "Layering", + "description": "Move the selected object above or below other objects", "options": [ { "name": "Move to Top", - "glyph": "\u00eb", + "cssclass": "icon-arrow-double-up", "key": "top" }, { "name": "Move Up", - "glyph": "\u005e", + "cssclass": "icon-arrow-up", "key": "up" }, { "name": "Move Down", - "glyph": "\u0076", + "cssclass": "icon-arrow-down", "key": "down" }, { "name": "Move to Bottom", - "glyph": "\u00ee", + "cssclass": "icon-arrow-double-down", "key": "bottom" } ] }, { "property": "fill", - "glyph": "", + "cssclass": "icon-paint-bucket", + "title": "Fill color", + "description": "Set fill color", "control": "color" }, { "property": "stroke", - "glyph": "â", + "cssclass": "icon-line-horz", + "title": "Border color", + "description": "Set border color", "control": "color" }, { "property": "color", - "glyph": "ä", + "cssclass": "icon-T", + "title": "Text color", + "description": "Set text color", "mandatory": true, "control": "color" }, { "property": "url", - "glyph": "ã", + "cssclass": "icon-image", "control": "dialog-button", "title": "Image Properties", + "description": "Edit image properties", "dialog": { "control": "textfield", "name": "Image URL", + "cssclass": "l-input-lg", "required": true } }, { "property": "text", - "glyph": "G", + "cssclass": "icon-gear", "control": "dialog-button", "title": "Text Properties", + "description": "Edit text properties", "dialog": { "control": "textfield", "name": "Text", @@ -146,15 +157,17 @@ define([ }, { "method": "showTitle", - "glyph": "ç", + "cssclass": "icon-two-parts-both", "control": "button", - "description": "Show telemetry element title." + "title": "Show title", + "description": "Show telemetry element title" }, { "method": "hideTitle", - "glyph": "å", + "cssclass": "icon-two-parts-one-only", "control": "button", - "description": "Hide telemetry element title." + "title": "Hide title", + "description": "Hide telemetry element title" } ] }, @@ -163,7 +176,7 @@ define([ { "method": "remove", "control": "button", - "glyph": "Z" + "cssclass": "icon-trash" } ] } @@ -175,9 +188,11 @@ define([ { "key": "telemetry.fixed", "name": "Fixed Position Display", - "glyph": "3", - "description": "A panel for collecting telemetry" + - " elements in a fixed position display.", + "cssclass": "icon-box-with-dashed-lines", + "description": "Collect and display telemetry elements in " + + "alphanumeric format in a simple canvas workspace. " + + "Elements can be positioned and sized. " + + "Lines, boxes and images can be added as well.", "priority": 899, "delegates": [ "telemetry" @@ -199,12 +214,12 @@ define([ { "name": "Horizontal grid (px)", "control": "textfield", - "cssclass": "l-small l-numeric" + "cssclass": "l-input-sm l-numeric" }, { "name": "Vertical grid (px)", "control": "textfield", - "cssclass": "l-small l-numeric" + "cssclass": "l-input-sm l-numeric" } ], "pattern": "^(\\d*[1-9]\\d*)?$", diff --git a/platform/features/imagery/bundle.js b/platform/features/imagery/bundle.js index 69684a2d85..63a12fd582 100644 --- a/platform/features/imagery/bundle.js +++ b/platform/features/imagery/bundle.js @@ -41,7 +41,7 @@ define([ { "name": "Imagery", "key": "imagery", - "glyph": "ã", + "cssclass": "icon-image", "template": imageryTemplate, "priority": "preferred", "needs": [ diff --git a/platform/features/imagery/res/templates/imagery.html b/platform/features/imagery/res/templates/imagery.html index 5242c1b189..fbdf4535af 100644 --- a/platform/features/imagery/res/templates/imagery.html +++ b/platform/features/imagery/res/templates/imagery.html @@ -5,18 +5,16 @@
- - < - - I
@@ -27,24 +25,24 @@
- + {{imagery.getZone()}} {{imagery.getTime()}} {{imagery.getDate()}}
- + ng-class="{ paused: imagery.paused() }"> - y + class="s-button icon-new-window"> + diff --git a/platform/features/layout/bundle.js b/platform/features/layout/bundle.js index 8af0706e68..134b0f68a4 100644 --- a/platform/features/layout/bundle.js +++ b/platform/features/layout/bundle.js @@ -56,7 +56,7 @@ define([ { "key": "layout", "name": "Display Layout", - "glyph": "\u004c", + "cssclass": "icon-layout", "type": "layout", "template": layoutTemplate, "editable": true, @@ -65,7 +65,7 @@ define([ { "key": "fixed", "name": "Fixed Position", - "glyph": "3", + "cssclass": "icon-box-with-dashed-lines", "type": "telemetry.panel", "template": fixedTemplate, "uses": [ @@ -77,28 +77,30 @@ define([ "items": [ { "method": "add", - "glyph": "\u002b", + "cssclass": "icon-plus", "control": "menu-button", "text": "Add", + "title": "Add", + "description": "Add new items", "options": [ { "name": "Box", - "glyph": "\u00e0", + "cssclass": "icon-box", "key": "fixed.box" }, { "name": "Line", - "glyph": "\u00e2", + "cssclass": "icon-line-horz", "key": "fixed.line" }, { "name": "Text", - "glyph": "\u00e4", + "cssclass": "icon-T", "key": "fixed.text" }, { "name": "Image", - "glyph": "\u00e3", + "cssclass": "icon-image", "key": "fixed.image" } ] @@ -109,63 +111,74 @@ define([ "items": [ { "method": "order", - "glyph": "á", + "cssclass": "icon-layers", "control": "menu-button", + "title": "Layering", + "description": "Move the selected object above or below other objects", "options": [ { "name": "Move to Top", - "glyph": "\u00eb", + "cssclass": "icon-arrow-double-up", "key": "top" }, { "name": "Move Up", - "glyph": "\u005e", + "cssclass": "icon-arrow-up", "key": "up" }, { "name": "Move Down", - "glyph": "\u0076", + "cssclass": "icon-arrow-down", "key": "down" }, { "name": "Move to Bottom", - "glyph": "\u00ee", + "cssclass": "icon-arrow-double-down", "key": "bottom" } ] }, { "property": "fill", - "glyph": "", + "cssclass": "icon-paint-bucket", + "title": "Fill color", + "description": "Set fill color", "control": "color" }, { "property": "stroke", - "glyph": "â", + "cssclass": "icon-line-horz", + "title": "Border color", + "description": "Set border color", "control": "color" }, { "property": "color", - "glyph": "ä", + "cssclass": "icon-T", + "title": "Text color", + "description": "Set text color", "mandatory": true, "control": "color" }, { "property": "url", - "glyph": "ã", + "cssclass": "icon-image", "control": "dialog-button", "title": "Image Properties", + "description": "Edit image properties", "dialog": { "control": "textfield", "name": "Image URL", + "cssclass": "l-input-lg", "required": true } }, { "property": "text", - "glyph": "G", + "cssclass": "icon-gear", "control": "dialog-button", "title": "Text Properties", + "description": "Edit text properties", "dialog": { "control": "textfield", "name": "Text", @@ -174,15 +187,17 @@ define([ }, { "method": "showTitle", - "glyph": "ç", + "cssclass": "icon-two-parts-both", "control": "button", - "description": "Show telemetry element title." + "title": "Show title", + "description": "Show telemetry element title" }, { "method": "hideTitle", - "glyph": "å", + "cssclass": "icon-two-parts-one-only", "control": "button", - "description": "Hide telemetry element title." + "title": "Hide title", + "description": "Hide telemetry element title" } ] }, @@ -191,7 +206,9 @@ define([ { "method": "remove", "control": "button", - "glyph": "Z" + "cssclass": "icon-trash", + "title": "Delete", + "description": "Delete the selected item" } ] } @@ -258,7 +275,7 @@ define([ { "key": "layout", "name": "Display Layout", - "glyph": "\u004c", + "cssclass": "icon-layout", "description": "Assemble other objects and components together into a reusable screen layout. Working in a simple canvas workspace, simply drag in the objects you want, position and size them. Save your design and view or edit it at any time.", "priority": 900, "features": "creation", @@ -290,7 +307,7 @@ define([ { "key": "telemetry.panel", "name": "Telemetry Panel", - "glyph": "t", + "cssclass": "icon-telemetry-panel", "description": "A panel for collecting telemetry elements.", "priority": 899, "delegates": [ @@ -313,12 +330,12 @@ define([ { "name": "Horizontal grid (px)", "control": "textfield", - "cssclass": "l-small l-numeric" + "cssclass": "l-input-sm l-numeric" }, { "name": "Vertical grid (px)", "control": "textfield", - "cssclass": "l-small l-numeric" + "cssclass": "l-input-sm l-numeric" } ], "pattern": "^(\\d*[1-9]\\d*)?$", diff --git a/platform/features/layout/res/templates/fixed.html b/platform/features/layout/res/templates/fixed.html index 76fc991102..4db5addf43 100644 --- a/platform/features/layout/res/templates/fixed.html +++ b/platform/features/layout/res/templates/fixed.html @@ -44,7 +44,7 @@ -
- - - - - - - - diff --git a/platform/features/layout/src/FixedDragHandle.js b/platform/features/layout/src/FixedDragHandle.js index de4b8ec92d..86fa4fb8c3 100644 --- a/platform/features/layout/src/FixedDragHandle.js +++ b/platform/features/layout/src/FixedDragHandle.js @@ -94,7 +94,7 @@ define( }; /** - * End a drag gesture. This should be callled when a drag + * End a drag gesture. This should be called when a drag * concludes to trigger commit of changes. */ FixedDragHandle.prototype.endDrag = function () { diff --git a/platform/features/layout/src/LayoutController.js b/platform/features/layout/src/LayoutController.js index 80470f25b3..88eae7462c 100644 --- a/platform/features/layout/src/LayoutController.js +++ b/platform/features/layout/src/LayoutController.js @@ -152,7 +152,7 @@ define( } // Convert from { positions: ..., dimensions: ... } to an - // apropriate ng-style argument, to position frames. + // appropriate ng-style argument, to position frames. LayoutController.prototype.convertPosition = function (raw) { var gridSize = this.gridSize; // Multiply position/dimensions by grid size diff --git a/platform/features/layout/src/elements/ElementFactory.js b/platform/features/layout/src/elements/ElementFactory.js index 2e686de192..121f94176e 100644 --- a/platform/features/layout/src/elements/ElementFactory.js +++ b/platform/features/layout/src/elements/ElementFactory.js @@ -55,6 +55,7 @@ define( key: "url", control: "textfield", name: "Image URL", + "cssclass": "l-input-lg", required: true } ] diff --git a/platform/features/layout/test/LayoutControllerSpec.js b/platform/features/layout/test/LayoutControllerSpec.js index dbc79e2769..6a23a29c04 100644 --- a/platform/features/layout/test/LayoutControllerSpec.js +++ b/platform/features/layout/test/LayoutControllerSpec.js @@ -164,7 +164,7 @@ define( // Populate scope mockScope.$watchCollection.mostRecentCall.args[1](); - // Verify precondtion + // Verify precondition expect(testConfiguration.panels.b).not.toBeDefined(); // Do a drag diff --git a/platform/features/pages/bundle.js b/platform/features/pages/bundle.js index 2b6a1bdf72..10be4de673 100644 --- a/platform/features/pages/bundle.js +++ b/platform/features/pages/bundle.js @@ -36,7 +36,7 @@ define([ { "key": "example.page", "name": "Web Page", - "glyph": "\u00ea", + "cssclass": "icon-page", "description": "Embed a web page or web-based image in a resizeable window component. Can be added to Display Layouts. Note that the URL being embedded must allow iframing.", "priority": 50, "features": [ diff --git a/platform/features/plot/bundle.js b/platform/features/plot/bundle.js index 3034d76814..ec4e6f375a 100644 --- a/platform/features/plot/bundle.js +++ b/platform/features/plot/bundle.js @@ -25,6 +25,7 @@ define([ "./src/PlotController", "./src/policies/PlotViewPolicy", "./src/PlotOptionsController", + "./src/services/ExportImageService", "text!./res/templates/plot.html", "text!./res/templates/plot-options-browse.html", 'legacyRegistry' @@ -33,6 +34,7 @@ define([ PlotController, PlotViewPolicy, PlotOptionsController, + exportImageService, plotTemplate, plotOptionsBrowseTemplate, legacyRegistry @@ -45,7 +47,7 @@ define([ { "name": "Plot", "key": "plot", - "glyph": "6", + "cssclass": "icon-sine", "template": plotTemplate, "needs": [ "telemetry" @@ -70,6 +72,8 @@ define([ "implementation": PlotController, "depends": [ "$scope", + "$element", + "exportImageService", "telemetryFormatter", "telemetryHandler", "throttle", @@ -84,12 +88,30 @@ define([ ] } ], + "services": [ + { + "key": "exportImageService", + "implementation": exportImageService, + "depends": [ + "$q", + "$timeout", + "$log", + "EXPORT_IMAGE_TIMEOUT" + ] + + } + ], "constants": [ { "key": "PLOT_FIXED_DURATION", "value": 900000, "priority": "fallback", "comment": "Fifteen minutes." + }, + { + "key": "EXPORT_IMAGE_TIMEOUT", + "value": 500, + "priority": "fallback" } ], "policies": [ @@ -103,6 +125,28 @@ define([ "key": "plot-options-browse", "template": plotOptionsBrowseTemplate } + ], + "licenses": [ + { + "name": "FileSaver.js", + "version": "0.0.2", + "author": "Eli Grey", + "description": "File download initiator (for file exports)", + "website": "https://github.com/eligrey/FileSaver.js/", + "copyright": "Copyright © 2015 Eli Grey.", + "license": "license-mit", + "link": "https://github.com/eligrey/FileSaver.js/blob/master/LICENSE.md" + }, + { + "name": "html2canvas", + "version": "0.4.1", + "author": "Niklas von Hertzen", + "description": "JavaScript HTML renderer", + "website": "https://github.com/niklasvh/html2canvas", + "copyright": "Copyright © 2012 Niklas von Hertzen.", + "license": "license-mit", + "link": "https://github.com/niklasvh/html2canvas/blob/master/LICENSE" + } ] } }); diff --git a/platform/features/plot/res/templates/plot-options-browse.html b/platform/features/plot/res/templates/plot-options-browse.html index b5a02887db..6e790ba95b 100644 --- a/platform/features/plot/res/templates/plot-options-browse.html +++ b/platform/features/plot/res/templates/plot-options-browse.html @@ -25,13 +25,13 @@ ng-model="configuration.plot.xAxis" structure="xAxisForm" name="xAxisFormState" - class="flex-elem l-flex-row no-validate no-margin"> + class="flex-elem l-flex-row no-margin"> + class="flex-elem l-flex-row no-margin">
@@ -60,7 +60,7 @@ ng-model="configuration.plot.series[$index]" structure="plotSeriesForm" name="plotOptionsState" - class="flex-elem l-flex-row no-validate"> + class="flex-elem l-flex-row"> diff --git a/platform/features/plot/res/templates/plot.html b/platform/features/plot/res/templates/plot.html index 98ca7338ca..461389e2c1 100644 --- a/platform/features/plot/res/templates/plot.html +++ b/platform/features/plot/res/templates/plot.html @@ -20,126 +20,136 @@ at runtime from the About dialog for additional information. --> -
-
- + class="abs holder holder-plot has-control-bar"> +
+ + + PNG + + + JPG + + +
+
+
+
+ + class='plot-legend-item' + ng-repeat="telemetryObject in subplot.getTelemetryObjects()" + ng-class="plot.getLegendClass(telemetryObject)"> {{telemetryObject.getModel().name}} -
-
- {{subplot.getHoverCoordinates()}} -
-
-
- {{axes[1].active.name}}
-
- {{tick.label | reverse}} +
+ {{subplot.getHoverCoordinates()}}
-
-
- +
+
+ {{axes[1].active.name}}
-
-
-
- - -
-
-
-
-
-
- - - -
- - < - - - I - -
- - {{plot.getMode().glyph}} - {{plot.getMode().name}} -
- +
+ {{tick.label | reverse}} +
+
+
+
-
-
-
- {{tick.label | reverse}} -
-
- {{axes[0].active.name}} -
-
-
- +
+ + +
+
+
+
+
+
+ + + +
+ + + + +
+ + {{plot.getMode().name}} +
+
    +
  • + {{option.name}} +
    • +
+
+
+
+
+ {{tick.label | reverse}} +
+
+ {{axes[0].active.name}} +
+
+
+ +
+
+
diff --git a/platform/features/plot/src/GLChart.js b/platform/features/plot/src/GLChart.js index 56ca29bb3e..0ca7776171 100644 --- a/platform/features/plot/src/GLChart.js +++ b/platform/features/plot/src/GLChart.js @@ -54,7 +54,8 @@ define( * @throws {Error} an error is thrown if WebGL is unavailable. */ function GLChart(canvas) { - var gl = canvas.getContext("webgl") || canvas.getContext("experimental-webgl"), + var gl = canvas.getContext("webgl", { preserveDrawingBuffer: true }) || + canvas.getContext("experimental-webgl", { preserveDrawingBuffer: true }), vertexShader, fragmentShader, program, diff --git a/platform/features/plot/src/PlotController.js b/platform/features/plot/src/PlotController.js index e240ac907d..b5af440731 100644 --- a/platform/features/plot/src/PlotController.js +++ b/platform/features/plot/src/PlotController.js @@ -63,6 +63,8 @@ define( */ function PlotController( $scope, + $element, + exportImageService, telemetryFormatter, telemetryHandler, throttle, @@ -246,6 +248,8 @@ define( }); self.pending = true; + self.$element = $element; + self.exportImageService = exportImageService; // Initialize axes; will get repopulated when telemetry // metadata becomes available. @@ -313,7 +317,7 @@ define( /** * Get the current mode that is applicable to this plot. This - * will include key, name, and glyph fields. + * will include key, name, and cssclass fields. */ PlotController.prototype.getMode = function () { return this.modeOptions.getMode(); @@ -364,6 +368,28 @@ define( return this.pending; }; + /** + * Export the plot to PNG + */ + PlotController.prototype.exportPNG = function () { + var self = this; + self.hideExportButtons = true; + self.exportImageService.exportPNG(self.$element[0], "plot.png").finally(function () { + self.hideExportButtons = false; + }); + }; + + /** + * Export the plot to JPG + */ + PlotController.prototype.exportJPG = function () { + var self = this; + self.hideExportButtons = true; + self.exportImageService.exportJPG(self.$element[0], "plot.jpg").finally(function () { + self.hideExportButtons = false; + }); + }; + return PlotController; } ); diff --git a/platform/features/plot/src/modes/PlotModeOptions.js b/platform/features/plot/src/modes/PlotModeOptions.js index 81be41f705..39658a35ac 100644 --- a/platform/features/plot/src/modes/PlotModeOptions.js +++ b/platform/features/plot/src/modes/PlotModeOptions.js @@ -27,13 +27,13 @@ define( var STACKED = { key: "stacked", name: "Stacked", - glyph: "m", + cssclass: "icon-plot-stacked", Constructor: PlotStackMode }, OVERLAID = { key: "overlaid", name: "Overlaid", - glyph: "6", + cssclass: "icon-plot-overlay", Constructor: PlotOverlayMode }; @@ -115,7 +115,7 @@ define( /** * Get all mode options available for each plot. Each - * mode contains a `name` and `glyph` field suitable + * mode contains a `name` and `cssclass` field suitable * for display in a template. * @return {Array} the available modes */ diff --git a/platform/features/plot/src/services/ExportImageService.js b/platform/features/plot/src/services/ExportImageService.js new file mode 100644 index 0000000000..8fa02c8bf5 --- /dev/null +++ b/platform/features/plot/src/services/ExportImageService.js @@ -0,0 +1,156 @@ +/***************************************************************************** + * Open MCT, Copyright (c) 2014-2016, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/** + * Module defining ExportImageService. Created by hudsonfoo on 09/02/16 + */ +define( + [ + "html2canvas", + "saveAs" + ], + function ( + html2canvas, + saveAs + ) { + var self = this; + + /** + * The export image service will export any HTML node to + * JPG, or PNG. + * @param {object} $q + * @param {object} $timeout + * @param {object} $log + * @param {constant} EXPORT_IMAGE_TIMEOUT time in milliseconds before a timeout error is returned + * @constructor + */ + function ExportImageService($q, $timeout, $log, EXPORT_IMAGE_TIMEOUT, injHtml2Canvas, injSaveAs, injFileReader) { + self.$q = $q; + self.$timeout = $timeout; + self.$log = $log; + self.EXPORT_IMAGE_TIMEOUT = EXPORT_IMAGE_TIMEOUT; + self.html2canvas = injHtml2Canvas || html2canvas; + self.saveAs = injSaveAs || saveAs; + self.reader = injFileReader || new FileReader(); + } + + /** + * Renders an HTML element into a base64 encoded image + * as a BLOB, PNG, or JPG. + * @param {node} element that will be converted to an image + * @param {string} type of image to convert the element to + * @returns {promise} + */ + function renderElement(element, type) { + var defer = self.$q.defer(), + validTypes = ["png", "jpg", "jpeg"], + renderTimeout; + + if (validTypes.indexOf(type) === -1) { + self.$log.error("Invalid type requested. Try: (" + validTypes.join(",") + ")"); + return; + } + + renderTimeout = self.$timeout(function () { + defer.reject("html2canvas timed out"); + self.$log.warn("html2canvas timed out"); + }, self.EXPORT_IMAGE_TIMEOUT); + + try { + self.html2canvas(element, { + onrendered: function (canvas) { + switch (type.toLowerCase()) { + case "png": + canvas.toBlob(defer.resolve, "image/png"); + break; + + default: + case "jpg": + case "jpeg": + canvas.toBlob(defer.resolve, "image/jpeg"); + break; + } + } + }); + } catch (e) { + defer.reject(e); + self.$log.warn("html2canvas failed with error: " + e); + } + + defer.promise.finally(renderTimeout.cancel); + + return defer.promise; + } + + /** + * canvas.toBlob() not supported in IE < 10, Opera, and Safari. This polyfill + * implements the method in browsers that would not otherwise support it. + * https://developer.mozilla.org/en-US/docs/Web/API/HTMLCanvasElement/toBlob + */ + function polyfillToBlob() { + if (!HTMLCanvasElement.prototype.toBlob) { + Object.defineProperty(HTMLCanvasElement.prototype, "toBlob", { + value: function (callback, type, quality) { + + var binStr = atob(this.toDataURL(type, quality).split(',')[1]), + len = binStr.length, + arr = new Uint8Array(len); + + for (var i = 0; i < len; i++) { + arr[i] = binStr.charCodeAt(i); + } + + callback(new Blob([arr], {type: type || "image/png"})); + } + }); + } + } + + /** + * Takes a screenshot of a DOM node and exports to JPG. + * @param {node} element to be exported + * @param {string} filename the exported image + * @returns {promise} + */ + ExportImageService.prototype.exportJPG = function (element, filename) { + return renderElement(element, "jpeg").then(function (img) { + self.saveAs(img, filename); + }); + }; + + /** + * Takes a screenshot of a DOM node and exports to PNG. + * @param {node} element to be exported + * @param {string} filename the exported image + * @returns {promise} + */ + ExportImageService.prototype.exportPNG = function (element, filename) { + return renderElement(element, "png").then(function (img) { + self.saveAs(img, filename); + }); + }; + + polyfillToBlob(); + + return ExportImageService; + } +); diff --git a/platform/features/plot/test/Canvas2DChartSpec.js b/platform/features/plot/test/Canvas2DChartSpec.js index b20d7b9c70..446c07d841 100644 --- a/platform/features/plot/test/Canvas2DChartSpec.js +++ b/platform/features/plot/test/Canvas2DChartSpec.js @@ -59,7 +59,7 @@ define( expect(mock2d.clearRect).toHaveBeenCalled(); }); - it("doees not construct if 2D is unavailable", function () { + it("does not construct if 2D is unavailable", function () { mockCanvas.getContext.andReturn(undefined); expect(function () { return new Canvas2DChart(mockCanvas); diff --git a/platform/features/plot/test/GLChartSpec.js b/platform/features/plot/test/GLChartSpec.js index fb575d7709..1ab0e6ea0a 100644 --- a/platform/features/plot/test/GLChartSpec.js +++ b/platform/features/plot/test/GLChartSpec.js @@ -82,7 +82,7 @@ define( expect(mockGL.clear).toHaveBeenCalled(); }); - it("doees not construct if WebGL is unavailable", function () { + it("does not construct if WebGL is unavailable", function () { mockCanvas.getContext.andReturn(undefined); expect(function () { return new GLChart(mockCanvas); diff --git a/platform/features/plot/test/PlotControllerSpec.js b/platform/features/plot/test/PlotControllerSpec.js index a3de710bdf..482af047cb 100644 --- a/platform/features/plot/test/PlotControllerSpec.js +++ b/platform/features/plot/test/PlotControllerSpec.js @@ -1,3 +1,5 @@ +/*global angular*/ + /***************************************************************************** * Open MCT, Copyright (c) 2014-2016, United States Government * as represented by the Administrator of the National Aeronautics and Space @@ -29,6 +31,8 @@ define( describe("The plot controller", function () { var mockScope, + mockElement, + mockExportImageService, mockFormatter, mockHandler, mockThrottle, @@ -65,6 +69,11 @@ define( "$scope", ["$watch", "$on", "$emit"] ); + mockElement = angular.element('
'); + mockExportImageService = jasmine.createSpyObj( + "ExportImageService", + ["exportJPG", "exportPNG"] + ); mockFormatter = jasmine.createSpyObj( "formatter", ["formatDomainValue", "formatRangeValue"] @@ -107,6 +116,8 @@ define( controller = new PlotController( mockScope, + mockElement, + mockExportImageService, mockFormatter, mockHandler, mockThrottle diff --git a/platform/features/plot/test/services/ExportImageServiceSpec.js b/platform/features/plot/test/services/ExportImageServiceSpec.js new file mode 100644 index 0000000000..675429f4e2 --- /dev/null +++ b/platform/features/plot/test/services/ExportImageServiceSpec.js @@ -0,0 +1,120 @@ +/***************************************************************************** + * Open MCT, Copyright (c) 2014-2016, United States Government + * as represented by the Administrator of the National Aeronautics and Space + * Administration. All rights reserved. + * + * Open MCT is licensed under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * http://www.apache.org/licenses/LICENSE-2.0. + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT + * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the + * License for the specific language governing permissions and limitations + * under the License. + * + * Open MCT includes source code licensed under additional open source + * licenses. See the Open Source Licenses file (LICENSES.md) included with + * this source code distribution or the Licensing information page available + * at runtime from the About dialog for additional information. + *****************************************************************************/ + +/** + * ExportImageServiceSpec. Created by hudsonfoo on 09/03/16. + */ +define( + ["../../src/services/ExportImageService"], + function (ExportImageService) { + var mockQ, + mockDeferred, + mockPromise, + mockTimeout, + mockLog, + mockHtml2Canvas, + mockCanvas, + mockSaveAs, + mockFileReader, + mockExportTimeoutConstant, + testElement, + exportImageService; + + describe("ExportImageService", function () { + beforeEach(function () { + mockDeferred = jasmine.createSpyObj( + "deferred", + ["reject", "resolve"] + ); + mockPromise = jasmine.createSpyObj( + "promise", + ["then", "finally"] + ); + mockPromise.then = function (callback) { + callback(); + }; + mockQ = { + "defer": function () { + return { + "resolve": mockDeferred.resolve, + "reject": mockDeferred.reject, + "promise": mockPromise + }; + } + }; + mockTimeout = function (fn, time) { + return { + "cancel": function () {} + }; + }; + mockLog = jasmine.createSpyObj( + "$log", + ["warn"] + ); + mockHtml2Canvas = jasmine.createSpy("html2canvas").andCallFake(function (element, opts) { + opts.onrendered(mockCanvas); + }); + mockCanvas = jasmine.createSpyObj( + "canvas", + ["toBlob"] + ); + mockSaveAs = jasmine.createSpy("saveAs"); + mockFileReader = jasmine.createSpyObj( + "FileReader", + ["readAsDataURL", "onloadend"] + ); + mockExportTimeoutConstant = 0; + testElement = {}; + + exportImageService = new ExportImageService( + mockQ, + mockTimeout, + mockLog, + mockExportTimeoutConstant, + mockHtml2Canvas, + mockSaveAs, + mockFileReader + ); + }); + + it("runs html2canvas and tries to save a png", function () { + exportImageService.exportPNG(testElement, "plot.png"); + + expect(mockHtml2Canvas).toHaveBeenCalledWith(testElement, { onrendered: jasmine.any(Function) }); + expect(mockCanvas.toBlob).toHaveBeenCalledWith(mockDeferred.resolve, "image/png"); + expect(mockDeferred.reject).not.toHaveBeenCalled(); + expect(mockSaveAs).toHaveBeenCalled(); + expect(mockPromise.finally).toHaveBeenCalled(); + }); + + it("runs html2canvas and tries to save a jpg", function () { + exportImageService.exportJPG(testElement, "plot.png"); + + expect(mockHtml2Canvas).toHaveBeenCalledWith(testElement, { onrendered: jasmine.any(Function) }); + expect(mockCanvas.toBlob).toHaveBeenCalledWith(mockDeferred.resolve, "image/jpeg"); + expect(mockDeferred.reject).not.toHaveBeenCalled(); + expect(mockSaveAs).toHaveBeenCalled(); + expect(mockPromise.finally).toHaveBeenCalled(); + }); + }); + } +); diff --git a/platform/features/static-markup/bundle.js b/platform/features/static-markup/bundle.js index afbc71e11b..ae610b3adc 100644 --- a/platform/features/static-markup/bundle.js +++ b/platform/features/static-markup/bundle.js @@ -36,7 +36,7 @@ define([ { "key": "static.markup", "name": "Static Markup", - "glyph": "p", + "cssclass": "icon-pencil", "description": "Static markup sandbox", "features": [ "creation" diff --git a/platform/features/table/bundle.js b/platform/features/table/bundle.js index f4d7b62b15..4c7b77b47e 100644 --- a/platform/features/table/bundle.js +++ b/platform/features/table/bundle.js @@ -60,7 +60,7 @@ define([ { "key": "table", "name": "Historical Telemetry Table", - "glyph": "\ue604", + "cssclass": "icon-tabular", "description": "A static table of all values over time for all included telemetry elements. Rows are timestamped data values for each telemetry element; columns are data fields. The number of rows is based on the range of your query. New incoming data must be manually re-queried for.", "priority": 861, "features": "creation", @@ -83,7 +83,7 @@ define([ { "key": "rttable", "name": "Real-time Telemetry Table", - "glyph": "\ue620", + "cssclass": "icon-tabular-realtime", "description": "A scrolling table of latest values for all included telemetry elements. Rows are timestamped data values for each telemetry element; columns are data fields. New incoming data is automatically added to the view.", "priority": 860, "features": "creation", @@ -127,7 +127,7 @@ define([ { "name": "Historical Table", "key": "table", - "glyph": "\ue604", + "cssclass": "icon-tabular", "templateUrl": "templates/historical-table.html", "needs": [ "telemetry" @@ -138,7 +138,7 @@ define([ { "name": "Real-time Table", "key": "rt-table", - "glyph": "\ue620", + "cssclass": "icon-tabular-realtime", "templateUrl": "templates/rt-table.html", "needs": [ "telemetry" diff --git a/platform/features/table/res/templates/historical-table.html b/platform/features/table/res/templates/historical-table.html index e2cd91b0db..d306601daf 100644 --- a/platform/features/table/res/templates/historical-table.html +++ b/platform/features/table/res/templates/historical-table.html @@ -4,6 +4,6 @@ rows="rows" enableFilter="true" enableSort="true" - class="tabular-holder t-exportable"> + class="tabular-holder has-control-bar">
\ No newline at end of file diff --git a/platform/features/table/res/templates/mct-table.html b/platform/features/table/res/templates/mct-table.html index fc18775742..ac06f53e28 100644 --- a/platform/features/table/res/templates/mct-table.html +++ b/platform/features/table/res/templates/mct-table.html @@ -1,8 +1,10 @@ - - Export - +
+ + Export + +
diff --git a/platform/features/table/res/templates/rt-table.html b/platform/features/table/res/templates/rt-table.html index c6fb0d2422..573eeb89f6 100644 --- a/platform/features/table/res/templates/rt-table.html +++ b/platform/features/table/res/templates/rt-table.html @@ -4,7 +4,7 @@ rows="rows" enableFilter="true" enableSort="true" - class="tabular-holder t-exportable" + class="tabular-holder has-control-bar" auto-scroll="true"> \ No newline at end of file diff --git a/platform/features/table/res/templates/table-options-edit.html b/platform/features/table/res/templates/table-options-edit.html index 01dc4904cd..db6c190acf 100644 --- a/platform/features/table/res/templates/table-options-edit.html +++ b/platform/features/table/res/templates/table-options-edit.html @@ -25,6 +25,6 @@ ng-model="configuration.table.columns" structure="columnsForm" name="columnsFormState" - class="flex-elem l-flex-row no-validate no-margin"> + class="flex-elem l-flex-row no-margin"> \ No newline at end of file diff --git a/platform/features/table/src/controllers/MCTTableController.js b/platform/features/table/src/controllers/MCTTableController.js index bf5ea9218c..d78140f67e 100644 --- a/platform/features/table/src/controllers/MCTTableController.js +++ b/platform/features/table/src/controllers/MCTTableController.js @@ -1,7 +1,7 @@ define( - [], - function () { + ['zepto'], + function ($) { /** * A controller for the MCTTable directive. Populates scope with @@ -16,13 +16,13 @@ define( var self = this; this.$scope = $scope; - this.element = element; + this.element = $(element[0]); this.$timeout = $timeout; this.maxDisplayRows = 50; - this.scrollable = element.find('div'); - this.thead = element.find('thead'); - this.tbody = element.find('tbody'); + this.scrollable = this.element.find('.l-view-section.scrolling').first(); + this.resultsHeader = this.element.find('.mct-table>thead').first(); + this.sizingTableBody = this.element.find('.sizing-table>tbody').first(); this.$scope.sizingRow = {}; this.scrollable.on('scroll', this.onScroll.bind(this)); @@ -261,8 +261,8 @@ define( * for individual rows. */ MCTTableController.prototype.setElementSizes = function () { - var thead = this.thead, - tbody = this.tbody, + var thead = this.resultsHeader, + tbody = this.sizingTableBody, firstRow = tbody.find('tr'), column = firstRow.find('td'), headerHeight = thead.prop('offsetHeight'), diff --git a/platform/features/table/test/controllers/MCTTableControllerSpec.js b/platform/features/table/test/controllers/MCTTableControllerSpec.js index 94ce7c71c2..285403423f 100644 --- a/platform/features/table/test/controllers/MCTTableControllerSpec.js +++ b/platform/features/table/test/controllers/MCTTableControllerSpec.js @@ -22,9 +22,16 @@ define( [ + "zepto", "../../src/controllers/MCTTableController" ], - function (MCTTableController) { + function ($, MCTTableController) { + + var MOCK_ELEMENT_TEMPLATE = + '
' + + '
' + + '
' + + '
'; describe('The MCTTable Controller', function () { @@ -55,19 +62,7 @@ define( watches[event] = callback; }); - mockElement = jasmine.createSpyObj('element', [ - 'find', - 'prop', - 'on' - ]); - mockElement.find.andReturn(mockElement); - mockElement.prop.andReturn(0); - mockElement[0] = { - scrollTop: 0, - scrollHeight: 500, - offsetHeight: 1000 - }; - + mockElement = $(MOCK_ELEMENT_TEMPLATE); mockExportService = jasmine.createSpyObj('exportService', [ 'exportCSV' ]); diff --git a/platform/features/timeline/bundle.js b/platform/features/timeline/bundle.js index 231622f1f9..42b3c948f9 100644 --- a/platform/features/timeline/bundle.js +++ b/platform/features/timeline/bundle.js @@ -151,7 +151,7 @@ define([ { "key": "timeline", "name": "Timeline", - "glyph": "\u0053", + "cssclass": "icon-timeline", "description": "A time-oriented container that lets you enclose and organize other Timelines and Activities. The Timeline view provides both tabular and Gantt views as well as resource utilization graphing of Activities.", "priority": 502, "features": [ @@ -182,6 +182,16 @@ define([ "capacity" ], "pattern": "^-?\\d+(\\.\\d*)?$" + }, + { + "name": "Battery starting SOC (%)", + "control": "textfield", + "required": false, + "conversion": "number", + "property": [ + "startingSOC" + ], + "pattern": "^([0-9](\\.\\d*)?|[1-9][0-9](\\.\\d*)?|100)%?$" } ], "model": { @@ -194,7 +204,7 @@ define([ { "key": "activity", "name": "Activity", - "glyph": "\u0061", + "cssclass": "icon-activity", "features": [ "creation" ], @@ -240,7 +250,7 @@ define([ { "key": "mode", "name": "Activity Mode", - "glyph": "\u0041", + "cssclass": "icon-activity-mode", "features": [ "creation" ], @@ -280,7 +290,7 @@ define([ { "key": "values", "name": "Values", - "glyph": "\u0041", + "cssclass": "icon-activity-mode", "template": valuesTemplate, "type": "mode", "uses": [ @@ -291,7 +301,7 @@ define([ { "key": "timeline", "name": "Timeline", - "glyph": "\u0053", + "cssclass": "icon-timeline", "type": "timeline", "description": "A time-oriented container that lets you enclose and organize other Timelines and Activities. The Timeline view provides both tabular and Gantt views as well as resource utilization graphing of Activities.", "template": timelineTemplate, @@ -302,18 +312,17 @@ define([ "items": [ { "method": "add", - "glyph": "\u002b", "control": "menu-button", "text": "Add", "options": [ { "name": "Timeline", - "glyph": "\u0053", + "cssclass": "icon-timeline", "key": "timeline" }, { "name": "Activity", - "glyph": "\u0061", + "cssclass": "icon-activity", "key": "activity" } ] @@ -323,13 +332,13 @@ define([ { "items": [ { - "glyph": "\u00e9", + "cssclass": "icon-plot-resource", "description": "Graph Resource Utilization", "control": "button", "method": "toggleGraph" }, { - "glyph": "\u0041", + "cssclass": "icon-activity-mode", "control": "dialog-button", "description": "Apply Activity Modes...", "title": "Apply Activity Modes", @@ -342,7 +351,7 @@ define([ "property": "modes" }, { - "glyph": "\u00e8", + "cssclass": "icon-chain-links", "description": "Edit Activity Link", "title": "Activity Link", "control": "dialog-button", @@ -355,7 +364,7 @@ define([ "property": "link" }, { - "glyph": "\u0047", + "cssclass": "icon-gear", "description": "Edit Properties...", "control": "button", "method": "properties" @@ -368,7 +377,7 @@ define([ "method": "remove", "description": "Remove Item", "control": "button", - "glyph": "\u005a" + "cssclass": "icon-trash" } ] } diff --git a/platform/features/timeline/res/sass/_timeline-thematic.scss b/platform/features/timeline/res/sass/_timeline-thematic.scss index d97dc4a58b..badbffe0b6 100644 --- a/platform/features/timeline/res/sass/_timeline-thematic.scss +++ b/platform/features/timeline/res/sass/_timeline-thematic.scss @@ -52,8 +52,8 @@ .l-pane-l { // Left pane of the tabular area .l-cols { - .s-label .ui-symbol.icon { - color: $colorGanttBarTabularFgIcon; + .t-object-label .t-item-icon { + color: pullForward($colorGanttBarBg, 10%); } } } @@ -104,7 +104,7 @@ } .s-ticks { - @include bgTicks($timelineColorAlt1); + @include bgTicks( $timelineColorAlt1); } .s-hover-btns-holder { $bg: $timelineHeaderColorBg; @@ -112,7 +112,7 @@ $l: 5%; @include user-select(none); @include background-image(linear-gradient(-90deg, rgba($bg, $bga), rgba($bg, $bga) 70%, rgba($bg, 0) 100%)); - .s-btn { + .s-button { height: 16px; line-height: 16px; .icon { diff --git a/platform/features/timeline/res/sass/_timelines.scss b/platform/features/timeline/res/sass/_timelines.scss index 62cb103e46..62b6ace5da 100644 --- a/platform/features/timeline/res/sass/_timelines.scss +++ b/platform/features/timeline/res/sass/_timelines.scss @@ -241,8 +241,8 @@ @include trans-prop-nice-fade(500ms); opacity: 0; height: $timelineTopPaneHeaderH; - width: 100px; left: auto; - padding: $interiorMargin; + left: auto; + padding: $interiorMargin $interiorMargin $interiorMargin $interiorMargin * 10; text-align: right; z-index: 10; } @@ -266,9 +266,6 @@ width: $timelineColIconW; text-align: center; padding: 0; - .ui-symbol { - color: $colorKey; - } } &.l-plot-resource { diff --git a/platform/features/timeline/res/templates/activity-gantt.html b/platform/features/timeline/res/templates/activity-gantt.html index 1436ab9d6e..df8f12ef0a 100644 --- a/platform/features/timeline/res/templates/activity-gantt.html +++ b/platform/features/timeline/res/templates/activity-gantt.html @@ -29,9 +29,7 @@ } : {}">
- - {{type.getGlyph()}} - + {{model.name}} diff --git a/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html b/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html index 09b798fcc1..8da5fe17c7 100644 --- a/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html +++ b/platform/features/timeline/res/templates/tabular-swimlane-cols-tree.html @@ -31,20 +31,17 @@ - - é + - - è -
@@ -27,7 +27,7 @@ - +
- é - è + + Title
@@ -102,26 +102,23 @@
-
- + - I - - X - - Y
diff --git a/platform/features/timeline/src/capabilities/GraphCapability.js b/platform/features/timeline/src/capabilities/GraphCapability.js index d9810005a3..181c909f79 100644 --- a/platform/features/timeline/src/capabilities/GraphCapability.js +++ b/platform/features/timeline/src/capabilities/GraphCapability.js @@ -37,7 +37,8 @@ define( // Build graphs for this group of utilizations function buildGraphs(utilizations) { var utilizationMap = {}, - result = {}; + result = {}, + startingSOC; // Bucket utilizations by type utilizations.forEach(function (u) { @@ -55,12 +56,14 @@ define( if (domainObject.getModel().type === 'timeline' && result.power && domainObject.getModel().capacity > 0) { + startingSOC = isNaN(parseFloat(domainObject.getModel().startingSOC)) ? + 100 : parseFloat(domainObject.getModel().startingSOC); result.battery = new CumulativeGraph( result.power, 0, domainObject.getModel().capacity, // Watts - domainObject.getModel().capacity, + (startingSOC / 100) * domainObject.getModel().capacity, 1 / 3600000 // millis-to-hour (since units are watt-hours) ); } diff --git a/platform/features/timeline/src/controllers/TimelineGanttController.js b/platform/features/timeline/src/controllers/TimelineGanttController.js index 7c3ee03244..6153064ebe 100644 --- a/platform/features/timeline/src/controllers/TimelineGanttController.js +++ b/platform/features/timeline/src/controllers/TimelineGanttController.js @@ -26,7 +26,7 @@ define( /** * Control for Gantt bars in a timeline view. - * Primarily reesponsible for supporting the positioning of Gantt + * Primarily responsible for supporting the positioning of Gantt * bars; particularly, this ensures that the left and right edges * never go to far off screen, because in some environments this * will effect rendering performance without visible results. diff --git a/platform/features/timeline/src/controllers/TimelineTickController.js b/platform/features/timeline/src/controllers/TimelineTickController.js index 41c57dedbf..56275a6d16 100644 --- a/platform/features/timeline/src/controllers/TimelineTickController.js +++ b/platform/features/timeline/src/controllers/TimelineTickController.js @@ -28,7 +28,7 @@ define( /** * Provides labels for the tick mark area of a timeline view. - * Since the tick mark regin is potentially extremeley large, + * Since the tick mark region is potentially extremely large, * only the subset of ticks which will actually be shown in * view are provided. * @constructor diff --git a/platform/features/timeline/src/controllers/drag/TimelineDragHandler.js b/platform/features/timeline/src/controllers/drag/TimelineDragHandler.js index f43cf18703..d7bb73c6ec 100644 --- a/platform/features/timeline/src/controllers/drag/TimelineDragHandler.js +++ b/platform/features/timeline/src/controllers/drag/TimelineDragHandler.js @@ -140,7 +140,7 @@ define( var timespan = timespans[toId(id)]; // Use as setter if argument is present if ((typeof value === 'number') && timespan) { - // Set the end (ensuring it doesn't preceed start) + // Set the end (ensuring it doesn't precede start) timespan.setEnd( Math.max(value, timespan.getStart()) ); diff --git a/platform/features/timeline/src/controllers/drag/TimelineSnapHandler.js b/platform/features/timeline/src/controllers/drag/TimelineSnapHandler.js index 70d854d008..42d13b8681 100644 --- a/platform/features/timeline/src/controllers/drag/TimelineSnapHandler.js +++ b/platform/features/timeline/src/controllers/drag/TimelineSnapHandler.js @@ -41,7 +41,7 @@ define( ids, candidates; - // Filter an id for inclustion + // Filter an id for inclusion function include(id) { return id !== exclude; } diff --git a/platform/features/timeline/test/capabilities/GraphCapabilitySpec.js b/platform/features/timeline/test/capabilities/GraphCapabilitySpec.js index 71a6de2ade..e2ccd376e2 100644 --- a/platform/features/timeline/test/capabilities/GraphCapabilitySpec.js +++ b/platform/features/timeline/test/capabilities/GraphCapabilitySpec.js @@ -101,6 +101,7 @@ define( it("provides a battery graph for timelines with capacity", function () { var mockCallback = jasmine.createSpy('callback'); testModel.capacity = 1000; + testModel.startingSOC = 100; testModel.type = "timeline"; mockDomainObject.useCapability.andReturn(asPromise([ { key: "power", start: 0, end: 15 } diff --git a/platform/forms/bundle.js b/platform/forms/bundle.js index daa7063ffe..d3ee14f440 100644 --- a/platform/forms/bundle.js +++ b/platform/forms/bundle.js @@ -32,6 +32,7 @@ define([ "text!./res/templates/controls/datetime.html", "text!./res/templates/controls/select.html", "text!./res/templates/controls/textfield.html", + "text!./res/templates/controls/textarea.html", "text!./res/templates/controls/button.html", "text!./res/templates/controls/color.html", "text!./res/templates/controls/composite.html", @@ -51,6 +52,7 @@ define([ datetimeTemplate, selectTemplate, textfieldTemplate, + textareaTemplate, buttonTemplate, colorTemplate, compositeTemplate, @@ -103,6 +105,10 @@ define([ "key": "textfield", "template": textfieldTemplate }, + { + "key": "textarea", + "template": textareaTemplate + }, { "key": "button", "template": buttonTemplate diff --git a/platform/forms/res/templates/controls/button.html b/platform/forms/res/templates/controls/button.html index c0aa5cd2f9..c7ce5383ad 100644 --- a/platform/forms/res/templates/controls/button.html +++ b/platform/forms/res/templates/controls/button.html @@ -19,12 +19,9 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> - - - {{structure.glyph}} - {{structure.text}} diff --git a/platform/forms/res/templates/controls/color.html b/platform/forms/res/templates/controls/color.html index 548cad3a3a..c9a4bbdd4a 100644 --- a/platform/forms/res/templates/controls/color.html +++ b/platform/forms/res/templates/controls/color.html @@ -19,54 +19,37 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> -
+
- - {{structure.glyph}} - + {{structure.text}} -
+ ng-show="toggle.isActive()">
-
- {{ngModel[field] === 'transparent' ? '2' : '' }} + class="l-palette-row l-option-row" + ng-if="!structure.mandatory"> +
None
-
+
- {{ngModel[field] === color ? '2' : '' }} + ng-click="ngModel[field] = color">
diff --git a/platform/forms/res/templates/controls/composite.html b/platform/forms/res/templates/controls/composite.html index 1c3559e2fc..e036617c3c 100644 --- a/platform/forms/res/templates/controls/composite.html +++ b/platform/forms/res/templates/controls/composite.html @@ -21,18 +21,18 @@ --> -
- - - - {{item.name}} - -
+
+ + + + {{item.name}} + +
diff --git a/platform/forms/res/templates/controls/menu-button.html b/platform/forms/res/templates/controls/menu-button.html index 17957177a7..bb57c9cdda 100644 --- a/platform/forms/res/templates/controls/menu-button.html +++ b/platform/forms/res/templates/controls/menu-button.html @@ -19,25 +19,20 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> -
- - {{structure.glyph}} {{structure.text}}
diff --git a/platform/forms/res/templates/controls/textarea.html b/platform/forms/res/templates/controls/textarea.html new file mode 100644 index 0000000000..45c4db4e1e --- /dev/null +++ b/platform/forms/res/templates/controls/textarea.html @@ -0,0 +1,31 @@ + + + + + + diff --git a/platform/forms/res/templates/form.html b/platform/forms/res/templates/form.html index 4326aead68..376dc152d7 100644 --- a/platform/forms/res/templates/form.html +++ b/platform/forms/res/templates/form.html @@ -19,39 +19,39 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> - - -
+ + +
{{section.name}}
-
- -
-
- {{row.name}} -
-
-
- - -
-
+ +
+ {{row.name}} +
+
+
+ +
- -
+
+ \ No newline at end of file diff --git a/platform/forms/res/templates/toolbar.html b/platform/forms/res/templates/toolbar.html index 58923e0314..f109b670e7 100644 --- a/platform/forms/res/templates/toolbar.html +++ b/platform/forms/res/templates/toolbar.html @@ -20,31 +20,31 @@ at runtime from the About dialog for additional information. -->
-
- - +
+ + - - - - - -
+ + + + + +
\ No newline at end of file diff --git a/platform/forms/src/controllers/DialogButtonController.js b/platform/forms/src/controllers/DialogButtonController.js index 4cdd5ffbbd..9a79b0c9da 100644 --- a/platform/forms/src/controllers/DialogButtonController.js +++ b/platform/forms/src/controllers/DialogButtonController.js @@ -63,7 +63,7 @@ define( // Prepare the structure for the button itself self.buttonStructure = {}; - self.buttonStructure.glyph = structure.glyph; + self.buttonStructure.cssclass = structure.cssclass; self.buttonStructure.name = structure.name; self.buttonStructure.description = structure.description; self.buttonStructure.click = showDialog; diff --git a/platform/forms/test/controllers/DialogButtonControllerSpec.js b/platform/forms/test/controllers/DialogButtonControllerSpec.js index dca6ef9da2..554ba4861f 100644 --- a/platform/forms/test/controllers/DialogButtonControllerSpec.js +++ b/platform/forms/test/controllers/DialogButtonControllerSpec.js @@ -46,7 +46,7 @@ define( ); testStructure = { name: "A Test", - glyph: "T", + cssclass: "icon-T", description: "Test description", control: "dialog-button", title: "Test title", @@ -83,7 +83,7 @@ define( mockScope.$watch.mostRecentCall.args[1](testStructure); buttonStructure = controller.getButtonStructure(); - expect(buttonStructure.glyph).toEqual(testStructure.glyph); + expect(buttonStructure.cssclass).toEqual(testStructure.cssclass); expect(buttonStructure.description).toEqual(testStructure.description); expect(buttonStructure.name).toEqual(testStructure.name); expect(buttonStructure.click).toEqual(jasmine.any(Function)); diff --git a/platform/framework/src/load/Bundle.js b/platform/framework/src/load/Bundle.js index a97dc3af5b..91bd966754 100644 --- a/platform/framework/src/load/Bundle.js +++ b/platform/framework/src/load/Bundle.js @@ -174,7 +174,7 @@ define( * category. * * @param {string} category name of the extension category - * @returns {Array} extension definitions of that cataegory + * @returns {Array} extension definitions of that category */ Bundle.prototype.getExtensions = function (category) { var extensions = this.definition.extensions[category] || [], diff --git a/platform/identity/src/IdentityIndicator.js b/platform/identity/src/IdentityIndicator.js index 1632e4747a..9a03df5f51 100644 --- a/platform/identity/src/IdentityIndicator.js +++ b/platform/identity/src/IdentityIndicator.js @@ -43,11 +43,8 @@ define( }); } - IdentityIndicator.prototype.getGlyph = function () { - return this.text && "P"; - }; - IdentityIndicator.prototype.getGlyphClass = function () { - return undefined; + IdentityIndicator.prototype.getCssClass = function () { + return this.text && "icon-person"; }; IdentityIndicator.prototype.getText = function () { return this.text; diff --git a/platform/identity/test/IdentityIndicatorSpec.js b/platform/identity/test/IdentityIndicatorSpec.js index 0aeefa0963..3fd75e6cff 100644 --- a/platform/identity/test/IdentityIndicatorSpec.js +++ b/platform/identity/test/IdentityIndicatorSpec.js @@ -46,25 +46,21 @@ define( key: "testuserid", name: "A User" }); - // Should have a single character glyph - expect(indicator.getGlyph().length).toEqual(1); - expect(indicator.getGlyphClass()).toBeUndefined(); + expect(indicator.getCssClass()).toEqual("icon-person"); expect(indicator.getText()).toEqual("A User"); expect(indicator.getDescription().indexOf("testuserid")) .not.toEqual(-1); }); it("shows nothing while no user information is available", function () { - expect(indicator.getGlyph()).toBeUndefined(); - expect(indicator.getGlyphClass()).toBeUndefined(); + expect(indicator.getCssClass()).toBeUndefined(); expect(indicator.getText()).toBeUndefined(); expect(indicator.getDescription()).toBeUndefined(); }); it("shows nothing when there is no identity information", function () { mockPromise.then.mostRecentCall.args[0](undefined); - expect(indicator.getGlyph()).toBeUndefined(); - expect(indicator.getGlyphClass()).toBeUndefined(); + expect(indicator.getCssClass()).toBeUndefined(); expect(indicator.getText()).toBeUndefined(); expect(indicator.getDescription()).toBeUndefined(); }); diff --git a/platform/persistence/couch/src/CouchDocument.js b/platform/persistence/couch/src/CouchDocument.js index 59fa3bfa3f..c16ca27f5c 100644 --- a/platform/persistence/couch/src/CouchDocument.js +++ b/platform/persistence/couch/src/CouchDocument.js @@ -27,7 +27,7 @@ define( /** * A CouchDocument describes domain object model in a format * which is easily read-written to CouchDB. This includes - * Couch's _id and _rev fields, as well as a sseparate + * Couch's _id and _rev fields, as well as a separate * metadata field which contains a subset of information found * in the model itself (to support search optimization with * CouchDB views.) @@ -37,7 +37,7 @@ define( * @param {object} model the model to store * @param {string} rev the revision to include (or undefined, * if no revision should be noted for couch) - * @param {boolean} whether or not to mark this documnet as + * @param {boolean} whether or not to mark this document as * deleted (see CouchDB docs for _deleted) */ function CouchDocument(id, model, rev, markDeleted) { diff --git a/platform/persistence/couch/src/CouchIndicator.js b/platform/persistence/couch/src/CouchIndicator.js index 3c3981c368..280a73e239 100644 --- a/platform/persistence/couch/src/CouchIndicator.js +++ b/platform/persistence/couch/src/CouchIndicator.js @@ -95,8 +95,8 @@ define( $interval(updateIndicator, interval); } - CouchIndicator.prototype.getGlyph = function () { - return "D"; + CouchIndicator.prototype.getCssClass = function () { + return "icon-database"; }; CouchIndicator.prototype.getGlyphClass = function () { diff --git a/platform/persistence/couch/test/CouchIndicatorSpec.js b/platform/persistence/couch/test/CouchIndicatorSpec.js index ea27669ba3..166b8fc82a 100644 --- a/platform/persistence/couch/test/CouchIndicatorSpec.js +++ b/platform/persistence/couch/test/CouchIndicatorSpec.js @@ -57,7 +57,7 @@ define( }); it("has a database icon", function () { - expect(indicator.getGlyph()).toEqual("D"); + expect(indicator.getCssClass()).toEqual("icon-database"); }); it("consults the database at the configured path", function () { @@ -69,7 +69,7 @@ define( initialDescrption = indicator.getDescription(), initialGlyphClass = indicator.getGlyphClass(); - // Nominal just means getting back an objeect, without + // Nominal just means getting back an object, without // an error field. mockPromise.then.mostRecentCall.args[0]({ data: {} }); @@ -88,7 +88,7 @@ define( initialDescrption = indicator.getDescription(), initialGlyphClass = indicator.getGlyphClass(); - // Nominal just means getting back an objeect, with + // Nominal just means getting back an object, with // an error field. mockPromise.then.mostRecentCall.args[0]( { data: { error: "Uh oh." } } @@ -110,7 +110,7 @@ define( initialDescrption = indicator.getDescription(), initialGlyphClass = indicator.getGlyphClass(); - // Nominal just means getting back an objeect, without + // Nominal just means getting back an object, without // an error field. mockPromise.then.mostRecentCall.args[1]({ data: {} }); diff --git a/platform/persistence/elastic/src/ElasticIndicator.js b/platform/persistence/elastic/src/ElasticIndicator.js index 2c4efc5d61..2c871fd77d 100644 --- a/platform/persistence/elastic/src/ElasticIndicator.js +++ b/platform/persistence/elastic/src/ElasticIndicator.js @@ -81,8 +81,8 @@ define( $interval(updateIndicator, interval, 0, false); } - ElasticIndicator.prototype.getGlyph = function () { - return "D"; + ElasticIndicator.prototype.getCssClass = function () { + return "icon-database"; }; ElasticIndicator.prototype.getGlyphClass = function () { return this.state.glyphClass; diff --git a/platform/persistence/elastic/src/ElasticSearchProvider.js b/platform/persistence/elastic/src/ElasticSearchProvider.js index 4bc0504760..c0930c7025 100644 --- a/platform/persistence/elastic/src/ElasticSearchProvider.js +++ b/platform/persistence/elastic/src/ElasticSearchProvider.js @@ -51,7 +51,7 @@ define([ * Search for domain objects using elasticsearch as a search provider. * * @param {String} searchTerm the term to search by. - * @param {Number} [maxResults] the max numer of results to return. + * @param {Number} [maxResults] the max number of results to return. * @returns {Promise} promise for a modelResults object. */ ElasticSearchProvider.prototype.query = function (searchTerm, maxResults) { diff --git a/platform/persistence/elastic/test/ElasticIndicatorSpec.js b/platform/persistence/elastic/test/ElasticIndicatorSpec.js index eff0c7667f..bfc3effcd0 100644 --- a/platform/persistence/elastic/test/ElasticIndicatorSpec.js +++ b/platform/persistence/elastic/test/ElasticIndicatorSpec.js @@ -59,7 +59,7 @@ define( }); it("has a database icon", function () { - expect(indicator.getGlyph()).toEqual("D"); + expect(indicator.getCssClass()).toEqual("icon-database"); }); it("consults the database at the configured path", function () { @@ -71,7 +71,7 @@ define( initialDescrption = indicator.getDescription(), initialGlyphClass = indicator.getGlyphClass(); - // Nominal just means getting back an objeect, without + // Nominal just means getting back an object, without // an error field. mockPromise.then.mostRecentCall.args[0]({ data: {} }); @@ -90,7 +90,7 @@ define( initialDescrption = indicator.getDescription(), initialGlyphClass = indicator.getGlyphClass(); - // Nominal just means getting back an objeect, without + // Nominal just means getting back an object, without // an error field. mockPromise.then.mostRecentCall.args[1]({ data: {} }); diff --git a/platform/persistence/local/src/LocalStorageIndicator.js b/platform/persistence/local/src/LocalStorageIndicator.js index c010ebb60e..9a59085ddb 100644 --- a/platform/persistence/local/src/LocalStorageIndicator.js +++ b/platform/persistence/local/src/LocalStorageIndicator.js @@ -40,8 +40,8 @@ define( function LocalStorageIndicator() { } - LocalStorageIndicator.prototype.getGlyph = function () { - return "D"; + LocalStorageIndicator.prototype.getCssClass = function () { + return "icon-database"; }; LocalStorageIndicator.prototype.getGlyphClass = function () { return 'caution'; diff --git a/platform/persistence/local/test/LocalStorageIndicatorSpec.js b/platform/persistence/local/test/LocalStorageIndicatorSpec.js index 99bc9462d0..c2e23683b5 100644 --- a/platform/persistence/local/test/LocalStorageIndicatorSpec.js +++ b/platform/persistence/local/test/LocalStorageIndicatorSpec.js @@ -38,7 +38,7 @@ define( }); it("has a database icon", function () { - expect(indicator.getGlyph()).toEqual("D"); + expect(indicator.getCssClass()).toEqual("icon-database"); }); it("has a 'caution' class to draw attention", function () { diff --git a/platform/persistence/queue/src/PersistenceQueue.js b/platform/persistence/queue/src/PersistenceQueue.js index de9ede2cfe..d0d4671f72 100644 --- a/platform/persistence/queue/src/PersistenceQueue.js +++ b/platform/persistence/queue/src/PersistenceQueue.js @@ -35,7 +35,7 @@ define( /** * The PersistenceQueue is used by the QueuingPersistenceCapability - * to aggregrate calls for object persistence. These are then issued + * to aggregate calls for object persistence. These are then issued * in a group, such that if some or all are rejected, this result can * be shown to the user (again, in a group.) * diff --git a/platform/persistence/queue/src/PersistenceQueueHandler.js b/platform/persistence/queue/src/PersistenceQueueHandler.js index 958b954e8f..679fbbb8df 100644 --- a/platform/persistence/queue/src/PersistenceQueueHandler.js +++ b/platform/persistence/queue/src/PersistenceQueueHandler.js @@ -25,7 +25,7 @@ define( function () { /** - * Handles actual persistence invocations for queeud persistence + * Handles actual persistence invocations for queued persistence * attempts, in a group. Handling in a group in this manner * also allows failure to be handled in a group (e.g. in a single * summary dialog.) diff --git a/platform/search/res/templates/search-menu.html b/platform/search/res/templates/search-menu.html index 50d1f955b8..daa350a77b 100644 --- a/platform/search/res/templates/search-menu.html +++ b/platform/search/res/templates/search-menu.html @@ -22,14 +22,13 @@
-
- +
    -
  • - - - - * - All
    • -
  • @@ -56,10 +51,6 @@ ng-change="controller.updateOptions()" /> - - - {{ type.glyph }} - {{ type.name }}
diff --git a/platform/search/res/templates/search.html b/platform/search/res/templates/search.html index abad85e38a..f589a1f4d5 100644 --- a/platform/search/res/templates/search.html +++ b/platform/search/res/templates/search.html @@ -19,41 +19,62 @@ this source code distribution or the Licensing information page available at runtime from the About dialog for additional information. --> -
-
- - - - - -
-
- Filtered by: {{ ngModel.filtersString }} -
-
- - - More Results -
+
+
+
+
+ + -
+ + + + + + +
+ + + Cancel +
+ +
+ Filtered by: {{ ngModel.filtersString }} +
+ +
+ {{ + !results.length > 0? 'No results found': + results.length + ' result' + (results.length > 1? 's':'') + ' found' + }} +
+ +
+ + + More Results +
+
+
\ No newline at end of file diff --git a/platform/search/src/controllers/SearchMenuController.js b/platform/search/src/controllers/SearchMenuController.js index ae53338795..f6018b732c 100644 --- a/platform/search/src/controllers/SearchMenuController.js +++ b/platform/search/src/controllers/SearchMenuController.js @@ -80,7 +80,7 @@ define(function () { // If there's still nothing in the filters string, there are no // filters selected if ($scope.ngModel.filtersString === '') { - $scope.ngModel.filtersString = 'NONE'; + $scope.ngModel.checkAll = true; } } @@ -95,12 +95,11 @@ define(function () { $scope.ngModel.checked[type] = false; }); - // Change the filters string depending on checkAll status - if ($scope.ngModel.checkAll) { - // This setting will make the filters display hidden - $scope.ngModel.filtersString = ''; - } else { - $scope.ngModel.filtersString = 'NONE'; + // This setting will make the filters display hidden + $scope.ngModel.filtersString = ''; + // Do not let checkAll become unchecked when it is the only checked filter + if (!$scope.ngModel.checkAll) { + $scope.ngModel.checkAll = true; } // Re-filter results diff --git a/platform/search/src/services/GenericSearchProvider.js b/platform/search/src/services/GenericSearchProvider.js index 8e35373fbb..6c8ce257ef 100644 --- a/platform/search/src/services/GenericSearchProvider.js +++ b/platform/search/src/services/GenericSearchProvider.js @@ -246,7 +246,7 @@ define([ /** * @private - * @returns {Number} a unique, unusued query Id. + * @returns {Number} a unique, unused query Id. */ GenericSearchProvider.prototype.makeQueryId = function () { var queryId = Math.ceil(Math.random() * 100000); diff --git a/platform/search/test/controllers/SearchControllerSpec.js b/platform/search/test/controllers/SearchControllerSpec.js index d03336fba0..b8c5c0c496 100644 --- a/platform/search/test/controllers/SearchControllerSpec.js +++ b/platform/search/test/controllers/SearchControllerSpec.js @@ -69,7 +69,7 @@ define([ ); mockSearchService.query.andReturn(mockPromise); - mockTypes = [{key: 'mock.type', name: 'Mock Type', glyph: '?'}]; + mockTypes = [{key: 'mock.type', name: 'Mock Type', cssclass: 'icon-object-unknown'}]; mockSearchResult = jasmine.createSpyObj( 'searchResult', @@ -123,7 +123,7 @@ define([ expect(mockScope.results).toContain('a'); }); - it('is loading until the service\'s promise fufills', function () { + it('is loading until the service\'s promise fulfills', function () { expect(mockScope.loading).toBeTruthy(); // Then resolve the promises @@ -163,7 +163,7 @@ define([ // Flag should be true with nonempty input expect(mockScope.ngModel.search).toEqual(true); - // Flag should be flase with empty input + // Flag should be false with empty input mockScope.ngModel.input = ''; controller.search(); mockPromise.then.mostRecentCall.args[0]({hits: [], total: 0}); diff --git a/platform/search/test/controllers/SearchMenuControllerSpec.js b/platform/search/test/controllers/SearchMenuControllerSpec.js index 2c17777c36..e4d566431c 100644 --- a/platform/search/test/controllers/SearchMenuControllerSpec.js +++ b/platform/search/test/controllers/SearchMenuControllerSpec.js @@ -39,8 +39,8 @@ define( ); mockTypes = [ - {key: 'mock.type.1', name: 'Mock Type 1', glyph: 'a'}, - {key: 'mock.type.2', name: 'Mock Type 2', glyph: 'b'} + {key: 'mock.type.1', name: 'Mock Type 1', cssclass: 'icon-layout'}, + {key: 'mock.type.2', name: 'Mock Type 2', cssclass: 'icon-telemetry'} ]; mockScope.ngModel = {}; @@ -54,7 +54,7 @@ define( controller = new SearchMenuController(mockScope, mockTypes); }); - it("gets types on initiliztion", function () { + it("gets types on initialization", function () { expect(mockScope.ngModel.types).toBeDefined(); }); @@ -76,14 +76,16 @@ define( expect(mockScope.ngModel.filtersString).not.toEqual(''); }); - it("changing checkAll status updates the filter string", function () { + it("changing checkAll status sets checkAll to true", function () { controller.checkAll(); + expect(mockScope.ngModel.checkAll).toEqual(true); expect(mockScope.ngModel.filtersString).toEqual(''); mockScope.ngModel.checkAll = false; controller.checkAll(); - expect(mockScope.ngModel.filtersString).toEqual('NONE'); + expect(mockScope.ngModel.checkAll).toEqual(true); + expect(mockScope.ngModel.filtersString).toEqual(''); }); it("checking checkAll option resets other options", function () { @@ -97,7 +99,7 @@ define( }); }); - it("tells the user when no options are checked", function () { + it("checks checkAll when no options are checked", function () { Object.keys(mockScope.ngModel.checked).forEach(function (type) { mockScope.ngModel.checked[type] = false; }); @@ -105,7 +107,8 @@ define( controller.updateOptions(); - expect(mockScope.ngModel.filtersString).toEqual('NONE'); + expect(mockScope.ngModel.filtersString).toEqual(''); + expect(mockScope.ngModel.checkAll).toEqual(true); }); it("tells the user when options are checked", function () { @@ -116,7 +119,6 @@ define( controller.updateOptions(); - expect(mockScope.ngModel.filtersString).not.toEqual('NONE'); expect(mockScope.ngModel.filtersString).not.toEqual(''); }); }); diff --git a/platform/telemetry/src/TelemetrySubscriber.js b/platform/telemetry/src/TelemetrySubscriber.js index 9cf17b5fa7..6466566423 100644 --- a/platform/telemetry/src/TelemetrySubscriber.js +++ b/platform/telemetry/src/TelemetrySubscriber.js @@ -31,7 +31,7 @@ define( * `telemetrySubscriber`. * * Subscriptions may also be made directly using the - * `telemetry` capability of a domain objcet; the subscriber + * `telemetry` capability of a domain object; the subscriber * uses this as well, but additionally handles delegation * (e.g. for telemetry panels) as well as latest-value * extraction. diff --git a/platform/telemetry/src/TelemetrySubscription.js b/platform/telemetry/src/TelemetrySubscription.js index ca0f11125d..dd5e4d3191 100644 --- a/platform/telemetry/src/TelemetrySubscription.js +++ b/platform/telemetry/src/TelemetrySubscription.js @@ -57,7 +57,7 @@ define( * `telemetrySubscriber` service. * * Subscriptions may also be made directly using the - * `telemetry` capability of a domain objcet; the subscriber + * `telemetry` capability of a domain object; the subscriber * uses this as well, but additionally handles delegation * (e.g. for telemetry panels) as well as latest-value * extraction. diff --git a/protractor/README b/protractor/README deleted file mode 100644 index 5734e5702d..0000000000 --- a/protractor/README +++ /dev/null @@ -1,69 +0,0 @@ -E2e Protractor Tests. - -1. Instructions: - - 1. 3 Control Scripts located in bin/. - run.js : node script used to start tests - start.js: node script used to setup test(starts node,localstorage and webdriver) - stop.js : node script, kills the 3 process started in start.js. - clean.js: node script used to remove the node_module directory.(clean up directory). - - 2. Use npm(Node Package Mangager) to Run Scripts. - a. cd protractor; - b. npm install; - c. To Run: - -npm start : will start processes need by protractor - -npm stop : will stop the processes need by protractor - -npm run-script run : will execute Protractor Script - -npm run-script all : will execute "start", "run", and "stop" script - -2. Directory Hierachy: - - -protractor: base directory - -common: contains prototype javascript functions that all other tests use. - -Buttons: common prototype functions related to enter fullscreen - -CreateItem: common prototype functions related to creating an item - -drag: common functions to test drag and drop. - -editItem: common functions used to test edit functionality. - -Launch: common script used to navigate the specified website. - -RightMenu: common functions for right click menu(remove). - -create - -e2e tests that creates the specified object. - -delete - -e2e tests that removes the specified object - -logs - -ctrl.sh redirects console output of MMAP, webdriver and elastic search and pipes them to log files. - -UI - -Contains tests that test the UI(drag drop, fullscreen, info bubble) - -conf.js: - -protractor config file. Explained below - -stressTest: - Tests that are used to test for memory leaks. You can use the new tab option on WARP and then open the - timeline in the new tab during the browser.sleep(). Once the test is do the browser will pause and you - can look a the timeline results in the new tab. - - NOTE: Cannot open chrome dev tools on same tab as the test are run on. Protractor uses the dev tools to - exectute the tests. - - -StressTest will create and delete folders. - -StressTestBubble.js: creates manny bubbles. - (Delay variable in InfoGesture.js was changed to 0) -3. Conf.js - Conf.js is used by protractor to setup and execute the tests. - -allScriptsTimeout: gives more time for protractor to synchronize with the page. - -jasmineNodeOpts: Protractor uses jasmine for the tests and jasmine has a default time out 30 seconds - per "it" test. Changed to maximume allowed time 360000 ms - -seleniumAddress: Protractor uses a Selenium server as a "proxy" between the test scripts and the browser - driver. A stand a lone version comes with protractor and to run use "webdriver-manager" - default address is: http://localhost:4444/wd/hub. - -specs[]: Is an array of files. Each File should have a "describe, it" test to be executed by protractor. - -capabilities: Tells protractor what browser to use and any browser arguments. - -4. bundle.json - bundle.json is used by npm to determine dependencies and location of script files. - -Dependencies: - "protractor": Contains protractor and webdriver package. - "psnode": Window/Unix Command, used for list/kill process.(ps aux) - "shelljs": Window/Unix Common JS Commands. eg rm,ls,exec - "sleep": Window/Unix Commands used to sleep the script - "string": Window/Unix Commands for string manipulation. \ No newline at end of file diff --git a/protractor/UI/DragDrop.js b/protractor/UI/DragDrop.js deleted file mode 100644 index b19c89dbce..0000000000 --- a/protractor/UI/DragDrop.js +++ /dev/null @@ -1,135 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var fullScreenFile = require("../common/Buttons"); -var createItem = require("../common/CreateItem") -var itemEdit = require("../common/EditItem"); -var rightMenu = require("../common/RightMenu"); -var Drag = require("../common/drag"); - -describe('Test Drag and Drop', function() { - var fullScreenClass = new fullScreenFile(); - var createClass = new createItem(); - var editItemClass = new itemEdit(); - var rightMenuClass = new rightMenu(); - var dragDrop = new Drag(); - - beforeEach(require('../common/Launch')); - - it('should create a folder', function(){ - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - - browser.wait(function() { - return createClass.createButton().click(); - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE); - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); - browser.sleep(1000); - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - }); - }); - it('should create a timer',function (){ - var ITEM_NAME = "Timer"; - var ITEM_TYPE = "timer"; - var ITEM_MENU_GLYPH = 'õ\nTimer'; - var ITEM_GRID_SELECT = 'P\nõ\nTimer'; - - browser.wait(function() { - return createClass.createButton().click(); - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE) - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); - browser.sleep(1500); - }).then(function (){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - }); - - }); - it('should drag timer into folder', function(){ - var ITEM_SIDE_SELECT = ">\nF\nFolder" - var name = "õ\nTimer"; - - rightMenuClass.select(ITEM_SIDE_SELECT, true).click(); - browser.sleep(2000); - var object = element.all(by.css('.ng-isolate-scope.ng-pristine.ng-valid')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === name; - }); - }); - var clock = object.get(1); - var panel = element(by.css('.items-holder.grid.abs.ng-scope')); - - //drag - expect(panel.isPresent()).toBe(true) - expect(clock.isPresent()).toBe(true) - browser.executeScript(dragDrop.DragDrop,clock.getWebElement(),panel.getWebElement()) - browser.sleep(3000); - //check - var dragObject = element.all(by.repeater('childObject in composition')).filter(function (ele) { - return ele.getText().then(function(text) { - return text === "P\nõ\nTimer" - }) - })//output console.log - /*expect(dragObject.get(0).isPresent()).toBe(true); - browser.manage().logs().get('browser').then(function(browserLogs) { - browserLogs.forEach(function(log){ - console.log(log.message); - }); - });*/ - }); - it('should delete the Folder Item', function(){ - var ITEM_SIDE_SELECT = ">\nF\nFolder" - browser.wait(function() { - return element.all(by.css('.ui-symbol.view-control.ng-binding.ng-scope')).isDisplayed(); - }); - rightMenuClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - it('should delete the Timer Item', function(){ - var ITEM_SIDE_SELECT = "õ\nTimer"; - browser.wait(function() { - return element.all(by.css('.ui-symbol.view-control.ng-binding.ng-scope')).isDisplayed(); - }); - rightMenuClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); -}); diff --git a/protractor/UI/Fullscreen.js b/protractor/UI/Fullscreen.js deleted file mode 100644 index 577cf4bef4..0000000000 --- a/protractor/UI/Fullscreen.js +++ /dev/null @@ -1,50 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -//TODO Add filter for duplications/ -var fullScreenFile = require("../common/Buttons"); - -describe('Enable Fullscreen', function() { - var fullScreenClass = new fullScreenFile(); - - beforeEach(require('../common/Launch')); - - beforeEach(function() { - browser.wait(function(){ - return element(by.css('[title="Enter full screen mode"]')).isPresent(); - }, 7000); - browser.sleep(1000); - }); - - it('should find fullscreen button', function(){ - expect(element(by.css('[title="Enter full screen mode"]')).isDisplayed()).toBeTruthy(); - - });it('should enter fullscreen when fullscreen button is pressed', function(){ - function getFullScreen(){ - return document.webkitIsFullScreen; - } - var fullscreen = browser.executeScript(getFullScreen) - expect(fullscreen).toBeFalsy(); - fullScreenClass.fullScreen() - fullscreen = browser.executeScript(getFullScreen) - expect(fullscreen).toBeTruthy(); - }); -}); diff --git a/protractor/UI/InfoBubble.js b/protractor/UI/InfoBubble.js deleted file mode 100644 index 07a77d9b41..0000000000 --- a/protractor/UI/InfoBubble.js +++ /dev/null @@ -1,43 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var fullScreenFile = require("../common/Buttons"); -var createItem = require("../common/CreateItem") -var itemEdit = require("../common/EditItem"); -var rightMenu = require("../common/RightMenu"); -var Drag = require("../common/drag"); - -describe('Info Bubble', function() { - var fullScreenClass = new fullScreenFile(); - var createClass = new createItem(); - var editItemClass = new itemEdit(); - var rightMenuClass = new rightMenu(); - var dragDrop = new Drag(); - - beforeEach(require('../common/Launch')); - - it('should detect info bubble', function(){ - var myitem = (element.all(by.repeater('child in composition'))).get(0); - browser.actions().mouseMove(myitem).perform(); - browser.sleep(4000); - expect(element(by.css('.t-infobubble.s-infobubble.l-infobubble-wrapper')).isDisplayed()).toBe(true); - }); -}); diff --git a/protractor/UI/NewWindow.js b/protractor/UI/NewWindow.js deleted file mode 100644 index 8f166ca55b..0000000000 --- a/protractor/UI/NewWindow.js +++ /dev/null @@ -1,90 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var fullScreenFile = require("../common/Buttons"); -var createClassFile = require("../common/CreateItem") -var itemEdit = require("../common/EditItem"); -var rightMenu = require("../common/RightMenu.js"); - -describe('New Window', function() { - var fullScreenClass = new fullScreenFile(); - var createClass = new createClassFile(); - var editItemClass = new itemEdit(); - var rightMenuClass = new rightMenu(); - - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - var ITEM_SIDE_SELECT = ">\nF\nFolder" - - beforeEach(require('../common/Launch')); - - it('should create an object and open it in new window', function(){ - function replaceString(string){ - //used to remove timestamp on the output so files can be compared - return string.replace(new RegExp("([0-1]?[0-9]|2[0-3]):[0-5][0-9]:[0-5][0-9]","g"),"z"); - } - browser.wait(function() { - return createClass.createButton().click(); - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE); - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); - browser.sleep(1000); - }).then(function (){ - //open file in new page - var before = browser.driver.getPageSource(); - before = browser.executeScript(replaceString, before) - - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - fullScreenClass.newWidnow().click(); - - var after = browser.driver.getPageSource(); - after = browser.executeScript(replaceString, after) - - browser.getAllWindowHandles().then(function (handles) { - browser.driver.switchTo().window(handles[1]); - browser.sleep(1000); - expect(before).toEqual(after); - browser.sleep(1000); - browser.driver.close(); - browser.driver.switchTo().window(handles[0]); - }); - }); - }); - it('should delete the object in the new window', function(){ - browser.wait(function() { - return element.all(by.css('.ui-symbol.view-control.ng-binding.ng-scope')).isDisplayed(); - }); - rightMenuClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - -}); diff --git a/protractor/UI/RightClick.js b/protractor/UI/RightClick.js deleted file mode 100644 index 07a52f2d9b..0000000000 --- a/protractor/UI/RightClick.js +++ /dev/null @@ -1,84 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var right_click = require("../common/RightMenu.js"); -var Create = require("../common/CreateItem") -var itemEdit = require("../common/EditItem"); - -describe('The Right Menu', function() { - var clickClass = new right_click(); - var createClass = new Create(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - - beforeEach(require('../common/Launch')); - - it('should Dissapear After Delete', function(){ - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE); - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); - browser.sleep(1000); - }).then(function (){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - }).then(function () { - var MyItem = ">\nF\nMy Items" - element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === MyItem; - }); - }).all(by.css('.ui-symbol.view-control.ng-binding.ng-scope')).click(); - var object = element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === ">\nF\nFolder"; - }); - }); - browser.sleep(1000) - browser.actions().mouseMove(object.get(0)).perform(); - browser.actions().click(protractor.Button.RIGHT).perform(); - browser.sleep(1000) - var menu = element.all(by.css('.ng-binding')).filter(function (ele){ - return ele.getText().then(function (text) { - return text == "Z\nRemove"; - }) - }) - menu.click(); - browser.sleep(1000) - - expect(menu.isDisplayed()).toBe(false); - }) - }); - -}); diff --git a/protractor/bin/clean.js b/protractor/bin/clean.js deleted file mode 100755 index 82e776901f..0000000000 --- a/protractor/bin/clean.js +++ /dev/null @@ -1,15 +0,0 @@ -#! /usr/bin/env node -var shell = require("shelljs/global"); - -var startdir = process.cwd(); -var command = "npm unlink"; - -console.log("Cleaning Directory") -exec(command, function(code, output) { - if(code != 0){ - console.log('Exit code:', code); - console.log('Program output:', output); - } -}); -console.log("rm -rf node_modules") -rm('-rf', __dirname + "/../node_modules") diff --git a/protractor/bin/ctrl.sh b/protractor/bin/ctrl.sh deleted file mode 100755 index faf385d2ad..0000000000 --- a/protractor/bin/ctrl.sh +++ /dev/null @@ -1,90 +0,0 @@ -#! /bin/bash -ARGUMENT=$1; - -if [ $# != 1 ]; then - echo "Expected 1 Aurgument. Received " $# 1>&2; - exit 1 -fi -#Start webdrive and http-server -if [ $ARGUMENT == start ]; then - echo "Creating Log Directory ..." - mkdir logs; - - cd .. - node app.js -p 1984 -x platform/persistence/elastic -i example/persistence > protractor/logs/nodeApp.log 2>&1 & - sleep 3; - if grep -iq "Error" protractor/logs/nodeApp.log; then - if grep -iq "minimist" protractor/logs/nodeApp.log; then - echo " Node Failed Because Minimist is not installed" - echo " Installng Minimist ..." - npm install minimist express > protractor/logs/minimist.log 2>&1 & - wait $! - if [ $? != 0 ]; then - echo " Error: minimist" - echo " Check Log file" - echo - else - echo " Started: Minimist" - echo - node app.js -p 1984 -x platform/persistence/elastic -i example/persistence > protractor/logs/nodeApp.log 2>&1 & - if grep -iq "Error" protractor/logs/nodeApp.log; then - echo " Error: node app failed" - echo " Check Log file" - echo - else - echo " Started: node app.js" - echo - fi - fi - else - echo " Error: node app failed" - echo " Check Log file" - echo - fi - else - echo " Started: node app.js" - echo - fi - echo "Starting webdriver ..." - - cd protractor; - webdriver-manager start > logs/webdriver.log 2>&1 & - sleep 3; - if grep -iq "Exception" logs/webdriver.log; then - echo " Error: webdriver-manager" - echo " Check Log file" - echo - else - echo " Started: webdriver-manager" - fi - echo "Starting Elastic Search..." - - elasticsearch > logs/elasticSearch.log 2>&1 & - sleep 3; - if grep -iq "Exception" logs/elasticSearch.log; then - echo " Error: ElasticSearch" - echo " Check Log file" - echo - else - echo " Started: ElasticSearch" - fi -#Runs Protractor tests -elif [ $ARGUMENT == run ]; then - protractor ./conf.js -#Kill Process -elif [ $ARGUMENT == stop ]; then - echo "Removing logs" - rm -rf logs - echo "Stopping Node" - kill $(ps aux | grep "[n]ode app.js"| awk '{print $2}'); - - echo "Stopping webdriver ..." - kill $(ps aux | grep "[p]rotractor" | awk '{print $2}'); - kill $(ps aux | grep "[w]ebdriver-manager" | awk '{print $2}'); - sleep 1; - echo "Stopping Elastic..." - kill $(ps aux | grep "[e]lastic" | awk '{print $2}'); - sleep 1; -else - echo "Unkown: Command" $1; -fi diff --git a/protractor/bin/run.js b/protractor/bin/run.js deleted file mode 100755 index 316caa11d0..0000000000 --- a/protractor/bin/run.js +++ /dev/null @@ -1,12 +0,0 @@ -#! /usr/bin/env node -var shell = require("shelljs/global"); -var sleep = require('sleep'); - -var command = __dirname + "/../node_modules/protractor/bin/protractor " +__dirname + "/../conf.js"; -console.log("Executing Protractor Test") -exec(command, function(code, output) { - if(code != 0){ - console.log('Exit code:', code); - console.log('Program output:', output); - } -}); \ No newline at end of file diff --git a/protractor/bin/start.js b/protractor/bin/start.js deleted file mode 100755 index 21aacc7efe..0000000000 --- a/protractor/bin/start.js +++ /dev/null @@ -1,40 +0,0 @@ -#! /usr/bin/env node -var shell,sleep; -try { - shell = require("shelljs/global"); - sleep = require('sleep'); -}catch (e){ - console.log("Dependencies Error"); - console.log("Run npm install"); - throw (e); -} -///Users/jsanderf/git/elastic/wtd/protractor/bin -var startdir = process.cwd(); -var command; -mkdir(__dirname + '/../logs'); - -command = __dirname + "/../node_modules/protractor/bin/webdriver-manager update"; -console.log("Installing Webdriver"); -exec(command,{async:false}); -sleep.sleep(1); - -console.log(); -cd(__dirname + '/../../'); -console.log('Installing Dependencies'); -exec("npm install minimist express", {async:false}); -console.log('Starting Node'); -sleep.sleep(1); -exec("node app.js -p 1984 -x example/persistence -x platform/persistence/elastic -i example/localstorage > protractor/logs/nodeApp.log 2>&1 &", {async:false}); -console.log(' Started Node'); - -console.log(); -console.log('Starting Webdriver'); -sleep.sleep(1); -exec("protractor/node_modules/protractor/bin/webdriver-manager start --standalone> protractor/logs/webdriver.log 2>&1 &",{async:false}); -if(error() == null){ - console.log(" Webdriver Started"); -}else{ - console.log(" Error : ", error()); -} -sleep.sleep(1); -cd(startdir); diff --git a/protractor/bin/stop.js b/protractor/bin/stop.js deleted file mode 100755 index ac2c3b4295..0000000000 --- a/protractor/bin/stop.js +++ /dev/null @@ -1,44 +0,0 @@ -#! /usr/bin/env node - -var shell = require("shelljs/global"); -var ps = require('psnode'); -var S = require('string'); -var sleep = require('sleep'); - -// A simple pid lookup -ps.list(function(err, results) { - - results.forEach(function( process ){ - //Killing Node - if(S(process.command).contains("node app.js")) { - console.log(); - console.log( 'Killing Node: %s', process.command); - ps.kill(process.pid, function(err, stdout) { - if (err) { - throw new Error(err); - } - console.log(stdout); - }); - }else if(S(process.command).contains("webdriver")) { - console.log(); - console.log( 'Killing WebDriver: %s', process.command); - ps.kill(process.pid, function(err, stdout) { - if (err){ - throw new Error(err); - } - console.log(stdout); - }); - }else if(S(process.command).contains("protractor")) { - console.log(); - console.log( 'Killing Chrome Drive: %s', process.command); - ps.kill(process.pid, function(err, stdout) { - if (err){ - throw new Error(err); - } - console.log(stdout); - }); - } - }); -}); - - diff --git a/protractor/common/Buttons.js b/protractor/common/Buttons.js deleted file mode 100644 index ec3d3c9c45..0000000000 --- a/protractor/common/Buttons.js +++ /dev/null @@ -1,41 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var Buttons = (function () { - function Buttons() { - } - //finds the Edit Button - Buttons.prototype.fullScreen = function () { - element(by.css('[title="Enter full screen mode"]')).click(); - - }; - Buttons.prototype.newWidnow = function () { - return element.all(by.css('[ng-click="parameters.action.perform()"]')).filter(function (arg) { - return arg.getAttribute("title").then(function (title){ - //expect(title).toEqual("Edit this object."); - return title == 'Open in a new browser tab'; - }) - }); - }; - return Buttons; - -})(); -module.exports = Buttons; diff --git a/protractor/common/CreateItem.js b/protractor/common/CreateItem.js deleted file mode 100644 index 6791b21d9e..0000000000 --- a/protractor/common/CreateItem.js +++ /dev/null @@ -1,194 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var CreateItem = (function () { - function CreateItem() {} - //finds the Create Button - CreateItem.prototype.createButton = function () { - return element.all(by.css('[ng-click="createController.toggle()"]')); - }; - function getFolderType(arg) { - switch(arg) { - case 'folder': - return "F\nFolder" - break; - case 'display': - return "L\nDisplay Layout" - break; - case 'telemetry': - return "t\nTelemetry Panel" - break; - case 'webpage': - return "ê\nWeb Page" - break; - case 'clock': - return "C\nClock" - break; - case 'timer': - return "õ\nTimer" - case 'timeline': - return "S\nTimeline" - break; - case 'activity': - return "a\nActivity" - break; - case 'activity-mode': - return "A\nActivity Mode" - break; - case 'sinewave': - return "T\nSine Wave Generator" - break; - default: - throw new Error("Unexpect State"); - } - } - //Selects Object from Create Menu - CreateItem.prototype.selectNewItem = function (itemText) { - item = getFolderType(itemText); - browser.wait(function(){ - return element(by.css('[ng-click="createAction.perform()"]')).isPresent(); - }, 6000); - this.els =element.all(by.css('[ng-click="createAction.perform()"]')); - this.todoButton = this.els.filter(function(elem) { - return elem.getText().then(function(text) { - return text === item; - }); - }); - return this.todoButton; - }; - //Fills Out Folder Forum - CreateItem.prototype.fillFolderForum = function (folderName, type) { - this.namefields = element.all(by.css('[ng-required="ngRequired"]')).filter(function (elem) { - return elem.getAttribute('type').then(function(text) { - return text === 'text'; - }); - }); - - browser.sleep(1000); - this.namefields.clear(); - browser.sleep(1000); - - this.namefields.get(0).sendKeys(folderName); - switch(type) { - case 'folder': - // return "F\nFolder" - break; - case 'display': - this.namefields.get(1).sendKeys("1"); - browser.sleep(1000); - this.namefields.get(2).sendKeys("2"); - break; - case 'telemetry': - this.namefields.get(1).sendKeys("1"); - browser.sleep(1000); - this.namefields.get(2).sendKeys("2"); - this.dropdownElement = element.all(by.model('ngModel[field]')).filter(function(elem) { - return elem.getTagName().then(function(tag) { - return tag === 'select'; - }); - }); - this.dropdownElement.click(); - this.dropdownElement.all(by.css('option')).get(1).click(); - browser.sleep(1000); - break; - case 'webpage': - this.namefields.get(1).sendKeys("http://test.com"); - browser.sleep(1000); - break; - case 'clock': - this.dropdownElement = element.all(by.model('ngModel[field]')).filter(function(elem) { - return elem.getTagName().then(function(tag) { - return tag === 'select'; - }); - }); - this.dropdownElement.get(0).click(); - this.dropdownElement.get(0).all(by.css('option')).get(0).click(); - browser.sleep(1000); - this.dropdownElement.get(1).click(); - this.dropdownElement.get(1).all(by.css('option')).get(0).click(); - browser.sleep(1000); - - break; - case 'timer': - this.timerDate = element.all(by.model('datetime.date')); - browser.sleep(1000); - this.timerDate.clear().sendKeys("2015-07-22"); - browser.sleep(1000); - this.timerDate = element.all(by.model('datetime.hour')); - this.timerDate.get(0).sendKeys("7"); - this.timerDate = element.all(by.model('datetime.min')); - this.timerDate.get(0).sendKeys("30"); - this.timerDate = element.all(by.model('datetime.sec')); - this.timerDate.get(0).sendKeys("000"); - browser.sleep(1000); - break; - case 'timeline': - this.timerDate = element.all(by.model('datetime.days')); - this.timerDate.clear().sendKeys("10"); - browser.sleep(1000); - this.timerDate = element.all(by.model('datetime.hours')); - this.timerDate.get(0).sendKeys("7"); - this.timerDate = element.all(by.model('datetime.minutes')); - this.timerDate.get(0).sendKeys("30"); - this.timerDate = element.all(by.model('datetime.seconds')); - this.timerDate.get(0).sendKeys("3"); - browser.sleep(1000); - break; - case 'activity': - this.startDay = element.all(by.model('datetime.days')); - this.startDay.clear().sendKeys("10"); - this.startHours = element.all(by.model('datetime.hours')); - this.startHours.get(0).clear().sendKeys("7"); - this.startMinutes = element.all(by.model('datetime.minutes')); - this.startMinutes.get(0).clear().sendKeys("30"); - this.startSeconds = element.all(by.model('datetime.seconds')); - this.startSeconds.get(0).clear().sendKeys("3"); - browser.sleep(1000); - //Duration - this.startDay.get(1).clear().sendKeys("1"); - this.startHours.get(1).clear().sendKeys("1"); - this.startMinutes.get(1).clear().sendKeys("0"); - this.startSeconds.get(1).clear().sendKeys("0"); - browser.sleep(1000); - break; - case 'activity-mode': - this.namefields.get(1).sendKeys("55"); - browser.sleep(1000); - this.namefields.get(2).sendKeys("10"); - break; - case 'sinewave': - this.namefields.get(1).sendKeys("10"); - browser.sleep(1000); - break; - default: - throw new Error("Unexpect State"); - } - return element.all(by.css('[ng-click="ngModel.confirm()"]')); - - }; - //TODO USAGE FOR CLICK ON OBJECT ONCE CREATED - CreateItem.prototype.findFolder = function (){ - return element.all(by.css('[ng-click="action.perform("navigate")"]')); - }; - return CreateItem; - -})(); -module.exports = CreateItem; diff --git a/protractor/common/EditItem.js b/protractor/common/EditItem.js deleted file mode 100644 index fb45fb1daf..0000000000 --- a/protractor/common/EditItem.js +++ /dev/null @@ -1,66 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var EditItem = (function () { - function EditItem() { - } - //finds the Edit Button - EditItem.prototype.SelectItem = function (item_title) { - return element.all(by.css('.item.grid-item.ng-scope')).filter(function (arg){ - return arg.getText().then(function (text) { - // expect(text).toEqual("fh"); - return text == item_title; - }); - }); - }; - EditItem.prototype.EditButton = function () { - return element.all(by.css('[ng-click="parameters.action.perform()"]')).filter(function (arg) { - return arg.getAttribute("title").then(function (title){ - //expect(title).toEqual("Edit"); - return title == 'Edit'; - }) - }); - }; - EditItem.prototype.CreateActivity = function () { - element.all(by.css('[ng-controller="ClickAwayController as toggle"]')).click(); - browser.sleep(1000); - var list = element.all(by.css('[ng-repeat="option in structure.options"]')).filter(function (arg){ - return arg.getText().then(function (text){ - //expect(text).toEqual("Edit this object."); - return text == "a\nActivity"; - }); - }).click(); - }; - EditItem.prototype.saveButton = function () { - element.all(by.css('[ng-click="currentAction.perform()"]')).filter(function (args){ - return args.getText().then(function (text) { - //expect(text).toEqual("Save"); - return text == "Save"; - }); - }).click(); - }; - function getFolderType(arg) { - - } - return EditItem; - -})(); -module.exports = EditItem; diff --git a/protractor/common/RightMenu.js b/protractor/common/RightMenu.js deleted file mode 100644 index d7df8efad4..0000000000 --- a/protractor/common/RightMenu.js +++ /dev/null @@ -1,116 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ - -var RightMenu = (function () { - - function RightMenu() { - } - function carrotMyItem(){ - var MyItem = ">\nF\nMy Items" - element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === MyItem; - }); - }).all(by.css('.ui-symbol.view-control.ng-binding.ng-scope')).click(); - } - //RightMenu Click on Object - RightMenu.prototype.delete = function (name, flag) { - if(typeof flag === 'undefined'){ - flag = true; - } - if(flag === true){ - carrotMyItem(); - } - browser.sleep(1000) - var object = element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === name; - }); - }); - browser.sleep(1000) - browser.actions().mouseMove(object.get(0)).perform(); - browser.actions().click(protractor.Button.RIGHT).perform(); - browser.sleep(1000) - element.all(by.css('.ng-binding')).filter(function (ele){ - return ele.getText().then(function (text) { - return text == "Z\nRemove"; - }) - }).click(); - browser.sleep(1000) - element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === name; - }); - }).then(function (folder) { - expect(folder.length).toBe(0); - }); - }; - RightMenu.prototype.reset = function (name) { - carrotMyItem(); - browser.sleep(1000) - var object = element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === name; - }); - }).click(); - browser.sleep(1000) - browser.actions().mouseMove(object.get(0)).perform(); - browser.actions().click(protractor.Button.RIGHT).perform(); - browser.sleep(1000) - var remove = element.all(by.css('.ng-binding')).filter(function (ele){ - return ele.getText().then(function (text) { - return text == "r\nRestart at 0"; - }) - }).click(); - browser.sleep(1000) - }; - //click '<', true==yes false==no - RightMenu.prototype.select = function(name, flag){ - if(typeof flag == "undefined"){ - flag = true; - } - if(flag == true){ - carrotMyItem(); - } - browser.sleep(1000) - return element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === name; - }); - }); - - }; - RightMenu.prototype.dragDrop = function(name){ - var object = element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === name; - }); - }); - var folder = object.get(0); - var panel = element(by.css('.items-holder.grid.abs.ng-scope')); - - browser.actions().dragAndDrop(folder, panel).perform(); - }; - return RightMenu; - -})(); -module.exports = RightMenu; diff --git a/protractor/common/drag.js b/protractor/common/drag.js deleted file mode 100644 index b8170e3057..0000000000 --- a/protractor/common/drag.js +++ /dev/null @@ -1,70 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -//drag function -/* -var e = document.createEvent("Event"); -e.initEvent('dragstart',true,false); -_element.dispatchEvent(e); -*/ -// qux.js -var Drag = (function () { - - function Drag() {}; - Drag.prototype.DragDrop = function(elem, zone){ - createEvent = function(type) { - var event = document.createEvent("event"); - event.initEvent(type, true, false); - event.dataTransfer = { - data: { - }, - setData: function(type, val){ - event.dataTransfer.data[type] = val; - }, - getData: function(type){ - return event.dataTransfer.data[type]; - } - }; - return event; - } - var event = createEvent('dragstart'); - event.effectAllowed = "copyMove"; - elem.dispatchEvent(event); - - var ele = createEvent('dragover'); - ele.preventDefault(); - zone.dispatchEvent(ele); - - var dropEvent = createEvent('drop', {}); - dropEvent.dataTransfer = event.dataTransfer; - dropEvent.preventDefault(); - zone.dispatchEvent(dropEvent); - - var dragEndEvent = createEvent('dragend', {}); - dragEndEvent.dataTransfer = event.dataTransfer; - elem.dispatchEvent(dragEndEvent); - }; - return Drag; -})(); -module.exports = Drag; - - - diff --git a/protractor/conf.js b/protractor/conf.js deleted file mode 100644 index ab3ed054dc..0000000000 --- a/protractor/conf.js +++ /dev/null @@ -1,67 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -/*global exports,process*/ - -// conf.js -exports.config = { - allScriptsTimeout: 500000, - jasmineNodeOpts: {defaultTimeoutInterval: 360000}, - seleniumAddress: 'http://localhost:4444/wd/hub', - //specs: ['StressTestCarrot.js'], - specs: [ - // 'create/CreateActivity.js', - // 'delete/DeleteActivity.js', - // 'create/CreateActivityMode.js', - // 'delete/DeleteActivityMode.js', - // 'create/CreateClock.js', - // 'delete/DeleteClock.js', - 'create/CreateDisplay.js', - 'delete/DeleteDisplay.js', - 'create/CreateFolder.js', - 'delete/DeleteFolder.js', - // 'create/CreateTelemetry.js', - // 'delete/DeleteTelemetry.js', - // 'create/CreateTimeline.js', - // 'delete/DeleteTimeline.js', - // 'create/CreateTimer.js', - // 'delete/DeleteTimer.js', - 'create/CreateWebPage.js', - 'delete/DeleteWebPage.js', - 'UI/Fullscreen.js', - 'create/CreateButton.js', - //"UI/DragDrop.js", - "UI/NewWindow.js" - //'UI/InfoBubble.js', - //'UI/RightClick.js' - ], - capabilities: { - 'browserName': 'chrome', // or 'safari' - 'chromeOptions': {} - } -}; - -// Allow specifying binary location as an environment variable, -// for cases where Chrome is not installed in a usual location. -if (process.env.CHROME_BIN) { - exports.config.capabilities.chromeOptions.binary = - process.env.CHROME_BIN; -} diff --git a/protractor/create/CreateActivity.js b/protractor/create/CreateActivity.js deleted file mode 100644 index fc1880e52e..0000000000 --- a/protractor/create/CreateActivity.js +++ /dev/null @@ -1,57 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); - -describe('Create Activity', function() { - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Activity"; - var ITEM_TYPE = "activity"; - var ITEM_MENU_GLYPH = 'a\nActivity'; - var ITEM_GRID_SELECT = 'P\na\nActivity\n0 Items'; - beforeEach(require('../common/Launch')); - it('should Create new Activity', function(){ - //button.click() - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE) - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - var ok = createClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); - browser.sleep(1000); - //ok.click(); - }).then(function (){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - }); - - }); - -}); diff --git a/protractor/create/CreateActivityMode.js b/protractor/create/CreateActivityMode.js deleted file mode 100644 index 76b600837d..0000000000 --- a/protractor/create/CreateActivityMode.js +++ /dev/null @@ -1,58 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); - -describe('Create Activity Mode', function() { - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Activity Mode"; - var ITEM_TYPE = "activity-mode"; - var ITEM_MENU_GLYPH = 'A\nActivity Mode'; - var ITEM_GRID_SELECT = 'P\nA\nActivity Mode'; - beforeEach(require('../common/Launch')); - it('should Create new Activity Mode', function(){ - //button.click() - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE) - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME,ITEM_TYPE).click(); - browser.sleep(1000); - - }).then(function (){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - }); - - }); - -}); diff --git a/protractor/create/CreateButton.js b/protractor/create/CreateButton.js deleted file mode 100644 index 1c5afcdc34..0000000000 --- a/protractor/create/CreateButton.js +++ /dev/null @@ -1,40 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -//TODO Add filter for duplications/ -describe('Create Button', function() { - beforeEach(require('../common/Launch')); - //it('should hava title "My Items"', function(){ - // expect(browser.getTitle()).toEqual('My Items'); - //}); - it('should find create menu to be invisible', function(){ - expect(element(by.css('[ng-show="createController.isActive()"]')).isDisplayed()).toBeFalsy(); - }); - it('should find create menu only visable after the create button clicked', function(){ - element(by.css('[ng-click="createController.toggle()"]')).click(); - expect(element(by.css('[ng-show="createController.isActive()"]')).isDisplayed()).toBeTruthy(); - }); - it('should find create menu only visable after the create button clicked', function(){ - element(by.css('[ng-click="createController.toggle()"]')).click(); - expect(element(by.css('[ng-show="createController.isActive()"]')).isDisplayed()).toBeTruthy(); - }); - -}); diff --git a/protractor/create/CreateClock.js b/protractor/create/CreateClock.js deleted file mode 100644 index 02dc81bb88..0000000000 --- a/protractor/create/CreateClock.js +++ /dev/null @@ -1,109 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); -var rightClick = require("../common/RightMenu"); -describe('Create Clock', function() { - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var rightClickClass = new rightClick(); - - var ITEM_NAME = "Clock"; - var ITEM_TYPE = "clock"; - var ITEM_MENU_GLYPH = 'C\nClock'; - var ITEM_GRID_SELECT = 'P\nC\nClock'; - beforeEach(require('../common/Launch')); - it('should Create new Clock', function(){ - //button.click() - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE) - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME,ITEM_TYPE).click(); - browser.sleep(1000); - }).then(function (){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - }); - - }); - it('should check clock', function () { - - function getTime(flag) { - function addZero(time){ - if(time < 10){ - return '0' + time; - } - return time; - } - var currentdate = new Date(); - - var month = currentdate.getMonth() + 1; - month = addZero(month); - - var day = currentdate.getDate(); - day = addZero(day); - - var hour = currentdate.getHours() - 5; - hour = addZero(hour); - - var second = currentdate.getSeconds(); - if(flag == true) { - second = second + 1; - } - second = addZero(second); - - var minute = currentdate.getMinutes(); - minute = addZero(minute); - - return ("UTC " + currentdate.getFullYear() + "/" + (month) + "/" + - day + " " + (hour) + ":" + minute + ":" + second + " PM"); - } - this.addMatchers({ - toBeIn: function(expected){ - var posibilities = Array.isArray(this.actual) ? this.actual : [this.actual]; - return posibilities.indexOf(expected) > -1; - } - }) - rightClickClass.select(ITEM_MENU_GLYPH, true).click().then(function () { - browser.sleep(1000); - browser.executeScript(getTime, false).then(function(current){ - browser.executeScript(getTime, true).then(function(current1) { - var clock = element(by.css('.l-time-display.l-digital.l-clock.s-clock.ng-scope')); - clock.getText().then(function (ele) { - expect([current,current1]).toBeIn(ele); - }) - }); - }); - - }) - }); -}); diff --git a/protractor/create/CreateDisplay.js b/protractor/create/CreateDisplay.js deleted file mode 100644 index 716e0c3ebd..0000000000 --- a/protractor/create/CreateDisplay.js +++ /dev/null @@ -1,58 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); - -describe('Create Display', function() { - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Display"; - var ITEM_TYPE = "display"; - var ITEM_MENU_GLYPH = 'L\nDisplay Layout'; - var ITEM_GRID_SELECT = 'P\nL\nDisplay\n0 Items'; - - beforeEach(require('../common/Launch')); - it('should Create new Display', function(){ - //button.click() - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE) - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME,ITEM_TYPE).click(); - browser.sleep(1000); - }).then(function (){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - }); - - }); - -}); diff --git a/protractor/create/CreateFolder.js b/protractor/create/CreateFolder.js deleted file mode 100644 index d1731791b9..0000000000 --- a/protractor/create/CreateFolder.js +++ /dev/null @@ -1,59 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -//TODO Add filter for duplications/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); - -describe('Create Folder', function() { - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - - beforeEach(require('../common/Launch')); - it('should Create new Folder', function(){ - - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE); - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); - browser.sleep(1000); - }).then(function (){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - }); - - }); - -}); diff --git a/protractor/create/CreateSineWave.js b/protractor/create/CreateSineWave.js deleted file mode 100644 index 396e3c70b5..0000000000 --- a/protractor/create/CreateSineWave.js +++ /dev/null @@ -1,59 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); - -describe('Create Sine Wave Generator', function() { - var createClass = new itemCreate(); - var ITEM_NAME = "Sine Wave G"; - var ITEM_TYPE = "sinewave"; - var ITEM_MENU_GLYPH = 'T\nSine Wave Generator' - beforeEach(require('../common/Launch')); - it('should Create new Sin Wave Generator' , function(){ - //button.click() - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE) - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - var ok = createClass.fillFolderForum(ITEM_NAME, ITEM_TYPE); - browser.sleep(1000); - ok.click(); - }).then(function (){ - var checkfolder = element.all(by.css('.title.ng-binding')).filter(function (ele) { - return ele.getTagName('div').then(function (tag){ - return tag == 'div'; - }); - }) - expect(checkfolder.getText()).toEqual([ '', 'Sine Wave G' ]); - - }); - - }); - -}); diff --git a/protractor/create/CreateTelemetry.js b/protractor/create/CreateTelemetry.js deleted file mode 100644 index 1e12c3f266..0000000000 --- a/protractor/create/CreateTelemetry.js +++ /dev/null @@ -1,59 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); - -describe('Create Telemetry', function() { - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Telemetry"; - var ITEM_TYPE = "telemetry"; - var ITEM_MENU_GLYPH = 't\nTelemetry Panel' - var ITEM_GRID_SELECT = 'P\nt\nTelemetry\n0 Items'; - - beforeEach(require('../common/Launch')); - - it('should Create new Telemetry', function(){ - //button.click() - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE) - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); - browser.sleep(1000); - }).then(function (){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - }); - - }); - -}); diff --git a/protractor/create/CreateTimeline.js b/protractor/create/CreateTimeline.js deleted file mode 100644 index 2f193fde3f..0000000000 --- a/protractor/create/CreateTimeline.js +++ /dev/null @@ -1,81 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); - -describe('Create Timeline', function() { - var createItemClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Timeline"; - var ITEM_TYPE = "timeline"; - var ITEM_MENU_GLYPH = 'S\nTimeline'; - var ITEM_GRID_SELECT = 'P\nS\nTimeline\n0 Items'; - beforeEach(require('../common/Launch')); - it('should Create Timeline', function(){ - //button.click() - browser.wait(function() { - createItemClass.createButton().click(); - return true; - }).then(function (){ - var folder = createItemClass.selectNewItem(ITEM_TYPE) - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createItemClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); - browser.sleep(1000); - }).then(function (){ - var fo= element.all(by.css('.item.grid-item.ng-scope')).filter(function (arg){ - return arg.getText().then(function (text) { - expect(text).toEqual("fh"); - return text == ITEM_GRID_SELECT; - }); - }); - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - - }); - }); - it('should Create Timeline Activity', function(){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - item.click(); - browser.sleep(1000); - expect(browser.getTitle()).toEqual(ITEM_NAME); - browser.sleep(1000); - var edit = editItemClass.EditButton(); - expect(edit.count()).toBe(1); - edit.click(); - browser.sleep(1000); - editItemClass.CreateActivity(); - var ok = createItemClass.fillFolderForum("Activity", "activity"); - browser.sleep(1000); - ok.click(); - browser.sleep(1000); - editItemClass.saveButton(); - //save.click(); - browser.sleep(5000); - }); - -}); diff --git a/protractor/create/CreateTimer.js b/protractor/create/CreateTimer.js deleted file mode 100644 index 666c820907..0000000000 --- a/protractor/create/CreateTimer.js +++ /dev/null @@ -1,74 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); -var rightClick = require("../common/RightMenu"); - -describe('Create Timer', function() { - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var rightMenu = new rightClick(); - - var ITEM_NAME = "Timer"; - var ITEM_TYPE = "timer"; - var ITEM_MENU_GLYPH = 'õ\nTimer'; - var ITEM_GRID_SELECT = 'P\nõ\nTimer'; - - beforeEach(require('../common/Launch')); - - it('should Create Timer', function(){ - //button.click() - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE) - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); - browser.sleep(1500); - }).then(function (){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - }); - }); - it('should test Timer', function(){ - browser.sleep(2000) - rightMenu.reset(ITEM_MENU_GLYPH); - browser.sleep(1000) - var timer = element(by.css('.value.ng-binding.active')) - timer.getText().then(function (time) { - var timerChecker = false; - if(time == "0D 00:00:01" || time == "0D 00:00:02"){ - timerChecker = true; - } - expect(timerChecker).toEqual(true) - }) - }); - -}); diff --git a/protractor/create/CreateWebPage.js b/protractor/create/CreateWebPage.js deleted file mode 100644 index b7ac7dbd6e..0000000000 --- a/protractor/create/CreateWebPage.js +++ /dev/null @@ -1,59 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); - -describe('Create Web Page', function() { - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Webpage"; - var ITEM_TYPE = "webpage"; - var ITEM_MENU_GLYPH = 'ê\nWeb Page'; - var ITEM_GRID_SELECT = 'P\nê\nWebpage'; - - beforeEach(require('../common/Launch')); - - it('should Create new Web Page', function(){ - //button.click() - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem('webpage') - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(1000); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME,ITEM_TYPE).click(); - browser.sleep(1000); - }).then(function (){ - var item = editItemClass.SelectItem(ITEM_GRID_SELECT); - expect(item.count()).toBe(1); - browser.sleep(1000); - }); - - }); - -}); diff --git a/protractor/ctrl.sh b/protractor/ctrl.sh deleted file mode 100755 index 04d6ebcc45..0000000000 --- a/protractor/ctrl.sh +++ /dev/null @@ -1,60 +0,0 @@ -#! /bin/bash -ARGUMENT=$1; -DIRECTORY=/Users/jsanderf/Applications; - -if [ $# != 1 ]; then - echo "Expected 1 Aurgument. Received " $# 1>&2; - exit 1 -fi -#Start webdrive and http-server -if [ $ARGUMENT == start ]; then - echo - echo "Starting MMAP ..." - $DIRECTORY/MAMP/ctlscript.sh start > logs/MAMP.log 2>&1 & - wait $! - if [ $? != 0 ]; then - echo " Error: MMAP" - echo " Check Log file" - echo - else - echo " Started: MMAP" - echo - fi - echo "Starting webdriver ..." - webdriver-manager start > logs/webdriver.log 2>&1 & - sleep 3; - if grep -iq "Exception" logs/webdriver.log; then - echo " Error: webdriver-manager" - echo " Check Log file" - echo - else - echo " Started: webdriver-manager" - fi - echo "Starting Elastic Search..." - elasticsearch > logs/elasticSearch.log 2>&1 & - sleep 3; - if grep -iq "Exception" logs/elasticSearch.log; then - echo " Error: ElasticSearch" - echo " Check Log file" - echo - else - echo " Started: ElasticSearch" - fi -#Runs Protractor tests -elif [ $ARGUMENT == run ]; then - protractor ./conf.js -#Kill Process -elif [ $ARGUMENT == stop ]; then - echo "Stopping MAMP" - $DIRECTORY/MAMP/ctlscript.sh stop >> logs/MAMP.log 2>&1 & - sleep 1; - echo "Stopping webdriver ..." - kill $(ps aux | grep "[p]rotractor" | awk '{print $2}'); - kill $(ps aux | grep "[w]ebdriver-manager" | awk '{print $2}'); - sleep 1; - echo "Stopping Elastic..." - kill $(ps aux | grep "[e]lastic" | awk '{print $2}'); - sleep 1; -else - echo "Unkown: Command" $1; -fi diff --git a/protractor/delete/DeleteActivity.js b/protractor/delete/DeleteActivity.js deleted file mode 100644 index a9e9d48333..0000000000 --- a/protractor/delete/DeleteActivity.js +++ /dev/null @@ -1,38 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var right_click = require("../common/RightMenu.js"); -var Create = require("../common/CreateItem") -describe('Delete Activity', function() { - var clickClass = new right_click(); - var createClass = new Create(); - var ITEM_NAME = "Activity"; - var ITEM_TYPE = "activity"; - var ITEM_MENU_GLYPH = 'a\nActivity'; - //var ITEM_GRID_SELECT = 'P\nS\nTimeline\n0 Items'; - var ITEM_SIDE_SELECT = ">\na\nActivity" - beforeEach(require('../common/Launch')); - it('should delete the Activity', function(){ - clickClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - -}); diff --git a/protractor/delete/DeleteActivityMode.js b/protractor/delete/DeleteActivityMode.js deleted file mode 100644 index 8568b1ac51..0000000000 --- a/protractor/delete/DeleteActivityMode.js +++ /dev/null @@ -1,38 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var right_click = require("../common/RightMenu.js"); -var Create = require("../common/CreateItem") -describe('Delete Activity Mode', function() { - var clickClass = new right_click(); - var createClass = new Create(); - var ITEM_NAME = "Activity Mode"; - var ITEM_TYPE = "activity-mode"; - var ITEM_MENU_GLYPH = 'A\nActivity Mode'; - var ITEM_GRID_SELECT = 'P\nA\nActivity Mode'; - var ITEM_SIDE_SELECT = "A\nActivity Mode" - beforeEach(require('../common/Launch')); - it('should delete the Activty Mode', function(){ - clickClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - -}); diff --git a/protractor/delete/DeleteClock.js b/protractor/delete/DeleteClock.js deleted file mode 100644 index 600619db09..0000000000 --- a/protractor/delete/DeleteClock.js +++ /dev/null @@ -1,38 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var right_click = require("../common/RightMenu.js"); -var Create = require("../common/CreateItem") -describe('Delete Clock', function() { - var clickClass = new right_click(); - var createClass = new Create(); - var ITEM_NAME = "Clock"; - var ITEM_TYPE = "clock"; - var ITEM_MENU_GLYPH = 'C\nClock'; - var ITEM_GRID_SELECT = 'P\nC\nClock'; - var ITEM_SIDE_SELECT = "C\nClock"; - beforeEach(require('../common/Launch')); - it('should delete the Clock', function(){ - clickClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - -}); diff --git a/protractor/delete/DeleteDisplay.js b/protractor/delete/DeleteDisplay.js deleted file mode 100644 index d33a1d1c94..0000000000 --- a/protractor/delete/DeleteDisplay.js +++ /dev/null @@ -1,38 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var right_click = require("../common/RightMenu.js"); -var Create = require("../common/CreateItem") -describe('Delete Display', function() { - var clickClass = new right_click(); - var createClass = new Create(); - var ITEM_NAME = "Display"; - var ITEM_TYPE = "display"; - var ITEM_MENU_GLYPH = 'L\nDisplay Layout'; - var ITEM_GRID_SELECT = 'P\nL\nDisplay Layout'; - var ITEM_SIDE_SELECT = ">\nL\nDisplay" - beforeEach(require('../common/Launch')); - it('should delete the Dispay', function(){ - clickClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - -}); diff --git a/protractor/delete/DeleteFolder.js b/protractor/delete/DeleteFolder.js deleted file mode 100644 index d38c9b9910..0000000000 --- a/protractor/delete/DeleteFolder.js +++ /dev/null @@ -1,38 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var right_click = require("../common/RightMenu.js"); -var Create = require("../common/CreateItem") -describe('Delete Folder', function() { - var clickClass = new right_click(); - var createClass = new Create(); - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - var ITEM_SIDE_SELECT = ">\nF\nFolder" - beforeEach(require('../common/Launch')); - it('should delete the folder', function(){ - clickClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - -}); diff --git a/protractor/delete/DeleteTelemetry.js b/protractor/delete/DeleteTelemetry.js deleted file mode 100644 index 447473fa4c..0000000000 --- a/protractor/delete/DeleteTelemetry.js +++ /dev/null @@ -1,38 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var right_click = require("../common/RightMenu.js"); -var Create = require("../common/CreateItem") -describe('Delete Telemetry', function() { - var clickClass = new right_click(); - var createClass = new Create(); - var ITEM_NAME = "Telemetry"; - var ITEM_TYPE = "telemetry"; - var ITEM_MENU_GLYPH = 't\nTelemetry Panel' - var ITEM_GRID_SELECT = 'P\nt\nTelemetry\n0 Items'; - var ITEM_SIDE_SELECT = ">\nt\nTelemetry" - beforeEach(require('../common/Launch')); - it('should delete the Telemetry', function(){ - clickClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - -}); diff --git a/protractor/delete/DeleteTimeline.js b/protractor/delete/DeleteTimeline.js deleted file mode 100644 index 9230700cd9..0000000000 --- a/protractor/delete/DeleteTimeline.js +++ /dev/null @@ -1,38 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var right_click = require("../common/RightMenu.js"); -var Create = require("../common/CreateItem") -describe('Delete Timeline', function() { - var clickClass = new right_click(); - var createClass = new Create(); - var ITEM_NAME = "Timeline"; - var ITEM_TYPE = "timeline"; - var ITEM_MENU_GLYPH = 'S\nTimeline'; - var ITEM_GRID_SELECT = 'P\nS\nTimeline\n0 Items'; - var ITEM_SIDE_SELECT = ">\nS\nTimeline" - beforeEach(require('../common/Launch')); - it('should delete the specified object', function(){ - clickClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - -}); diff --git a/protractor/delete/DeleteTimer.js b/protractor/delete/DeleteTimer.js deleted file mode 100644 index a1f1985905..0000000000 --- a/protractor/delete/DeleteTimer.js +++ /dev/null @@ -1,38 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var right_click = require("../common/RightMenu.js"); -var Create = require("../common/CreateItem") -describe('Delete Timer', function() { - var clickClass = new right_click(); - var createClass = new Create(); - var ITEM_NAME = "Timer"; - var ITEM_TYPE = "timer"; - var ITEM_MENU_GLYPH = 'õ\nTimer'; - var ITEM_GRID_SELECT = 'P\nõ\nTimer'; - var ITEM_SIDE_SELECT = "õ\nTimer" - beforeEach(require('../common/Launch')); - it('should delete the Timer', function(){ - clickClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - -}); diff --git a/protractor/delete/DeleteWebPage.js b/protractor/delete/DeleteWebPage.js deleted file mode 100644 index dc6fd34e22..0000000000 --- a/protractor/delete/DeleteWebPage.js +++ /dev/null @@ -1,37 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var right_click = require("../common/RightMenu.js"); -var Create = require("../common/CreateItem") -describe('Delete Webpage', function() { - var clickClass = new right_click(); - var createClass = new Create(); - var ITEM_NAME = "Webpage"; - var ITEM_TYPE = "webpage"; - var ITEM_MENU_GLYPH = 'ê\nWeb Page'; - var ITEM_SIDE_SELECT = "ê\nWebpage" - beforeEach(require('../common/Launch')); - it('should delete the Webpage', function(){ - clickClass.delete(ITEM_SIDE_SELECT); - browser.sleep(1000); - }); - -}); diff --git a/protractor/package.json b/protractor/package.json deleted file mode 100644 index b43b9b1cdb..0000000000 --- a/protractor/package.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "name": "ProtractorLauncher", - "version": "1.0.0", - "scripts" : { - "start" : "bin/start.js", - "protractor" : "bin/run.js", - "stop" : "bin/stop.js", - "all" : "bin/start.js; bin/run.js; bin/stop.js;", - "clean" : "bin/clean.js" - }, - "dependencies": { - "protractor": "^2.1.0", - "psnode": "0.0.1", - "shelljs": "^0.5.2", - "sleep": "^3.0.0", - "string": "^3.3.1" - }, - "description": "E2e Protractor Tests.", - "license": "ISC" -} diff --git a/protractor/stressTest/StressTest.js b/protractor/stressTest/StressTest.js deleted file mode 100644 index f5f7bc25be..0000000000 --- a/protractor/stressTest/StressTest.js +++ /dev/null @@ -1,78 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); -var right_click = require("../common/RightMenu.js"); - -describe('Create Folder', function() { - var clickClass = new right_click(); - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - var ITEM_SIDE_SELECT = ">\nF\nFolder" - - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); - it('should Create new Folder', function(){ - browser.sleep(5000); - for(var i=0; i < 25; i++){ - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - var folder = createClass.selectNewItem(ITEM_TYPE); - expect(folder.getText()).toEqual([ ITEM_MENU_GLYPH ]); - browser.sleep(500); - folder.click() - }).then(function() { - browser.wait(function () { - return element.all(by.model('ngModel[field]')).isDisplayed(); - }) - createClass.fillFolderForum(ITEM_NAME, ITEM_TYPE).click(); - browser.sleep(500); - }).then(function (){ - browser.sleep(500); - clickClass.delete(ITEM_SIDE_SELECT, true); - //element.all(by.css('.ui-symbol.view-control.ng-binding.ng-scope')).click(); - - - var MyItem = ">\nF\nMy Items" - element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - //expect(text).toEqual(MyItem); - return text === MyItem; - }); - }).all(by.css('.ui-symbol.view-control.ng-binding.ng-scope')).click(); - // clickClass.delete(ITEM_SIDE_SELECT, false); - }); - } - browser.pause(); - - }); - -}); diff --git a/protractor/stressTest/StressTestBubble.js b/protractor/stressTest/StressTestBubble.js deleted file mode 100644 index de77c5be7e..0000000000 --- a/protractor/stressTest/StressTestBubble.js +++ /dev/null @@ -1,59 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/StressTestBubble.jsStressTestBubble.js -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); -var right_click = require("../common/RightMenu.js"); - -describe('Create Folder', function() { - var clickClass = new right_click(); - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - var ITEM_SIDE_SELECT = ">\nF\nFolder" - - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); - it('should Create new Folder', function(){ - browser.sleep(10000); - for(var i=0; i < 1000; i++){ - var object = element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === ">\nF\nMy Items"; - }); - }); - //browser.sleep(1000) - browser.actions().mouseMove(object.get(0)).perform(); - //browser.actions().click(protractor.Button.RIGHT).perform(); - - element.all(by.css('.items-holder.grid.abs.ng-scope')).click(); - } - browser.pause(); - - }); - -}); diff --git a/protractor/stressTest/StressTestCreateButton.js b/protractor/stressTest/StressTestCreateButton.js deleted file mode 100644 index 19699ba123..0000000000 --- a/protractor/stressTest/StressTestCreateButton.js +++ /dev/null @@ -1,56 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); -var right_click = require("../common/RightMenu.js"); - -describe('Create Folder', function() { - var clickClass = new right_click(); - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - var ITEM_SIDE_SELECT = ">\nF\nFolder" - - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); - it('should Create new Folder', function(){ - browser.sleep(10000); - for(var i=0; i < 1000; i++){ - createClass.createButton().click(); - - //browser.sleep(1000) - //browser.actions().mouseMove(object.get(0)).perform(); - //browser.actions().click(protractor.Button.RIGHT).perform(); - - element.all(by.css('.items-holder.grid.abs.ng-scope')).click(); - } - browser.pause(); - - }); - -}); diff --git a/protractor/stressTest/StressTestMenu.js b/protractor/stressTest/StressTestMenu.js deleted file mode 100644 index 4475d592c9..0000000000 --- a/protractor/stressTest/StressTestMenu.js +++ /dev/null @@ -1,55 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); -var right_click = require("../common/RightMenu.js"); - -describe('Create Folder', function() { - var clickClass = new right_click(); - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - var ITEM_SIDE_SELECT = ">\nF\nFolder" - - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); - it('should Create new Folder', function(){ - browser.sleep(10000); - for(var i=0; i < 1000; i++){ - browser.wait(function() { - createClass.createButton().click(); - return true; - }).then(function (){ - element.all(by.css('.items-holder.grid.abs.ng-scope')).click(); - }) - } - browser.pause(); - - }); - -}); diff --git a/protractor/stressTest/StressTestNewPage.js b/protractor/stressTest/StressTestNewPage.js deleted file mode 100644 index df8f305818..0000000000 --- a/protractor/stressTest/StressTestNewPage.js +++ /dev/null @@ -1,61 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); -var right_click = require("../common/RightMenu.js"); -var fullScreenFile = require("../common/FullScreen"); - -describe('Create Folder', function() { - var clickClass = new right_click(); - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var fullScreenClass = new fullScreenFile(); - - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - var ITEM_SIDE_SELECT = ">\nF\nFolder" - - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); - it('should Create new Folder', function(){ - browser.sleep(15000); - for(var i=0; i < 1000; i++){ - fullScreenClass.newWidnow().click(); - - browser.getAllWindowHandles().then(function (handles) { - //browser.driver.switchTo().window(handles[1]); - browser.sleep(1000); - browser.driver.close(); - browser.sleep(1000); - // browser.driver.switchTo().window(handles[0]); - }); - } - browser.pause(); - - }); - -}); diff --git a/protractor/stressTest/StressTestRightClick.js b/protractor/stressTest/StressTestRightClick.js deleted file mode 100644 index abd51a256b..0000000000 --- a/protractor/stressTest/StressTestRightClick.js +++ /dev/null @@ -1,59 +0,0 @@ -/***************************************************************************** - * Open MCT, Copyright (c) 2014-2016, United States Government - * as represented by the Administrator of the National Aeronautics and Space - * Administration. All rights reserved. - * - * Open MCT is licensed under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * http://www.apache.org/licenses/LICENSE-2.0. - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, WITHOUT - * WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the - * License for the specific language governing permissions and limitations - * under the License. - * - * Open MCT includes source code licensed under additional open source - * licenses. See the Open Source Licenses file (LICENSES.md) included with - * this source code distribution or the Licensing information page available - * at runtime from the About dialog for additional information. - *****************************************************************************/ -var itemCreate = require("../common/CreateItem"); -var itemEdit = require("../common/EditItem"); -var right_click = require("../common/RightMenu.js"); - -describe('Create Folder', function() { - var clickClass = new right_click(); - var createClass = new itemCreate(); - var editItemClass = new itemEdit(); - var ITEM_NAME = "Folder"; - var ITEM_TYPE = "folder"; - var ITEM_MENU_GLYPH = 'F\nFolder'; - var ITEM_GRID_SELECT = 'P\nF\nFolder\n0 Items'; - var ITEM_SIDE_SELECT = ">\nF\nFolder" - - beforeEach(function() { - browser.ignoreSynchronization = true; - browser.get('http://localhost:1984/warp/'); - browser.sleep(2000); // 20 seconds - }); - it('should Create new Folder', function(){ - browser.sleep(8000); - for(var i=0; i < 1000; i++){ - var object = element.all(by.repeater('child in composition')).filter(function (ele){ - return ele.getText().then(function(text) { - return text === ">\nF\nMy Items"; - }); - }); - //browser.sleep(1000) - browser.actions().mouseMove(object.get(0)).perform(); - browser.actions().click(protractor.Button.RIGHT).perform(); - - element.all(by.css('.items-holder.grid.abs.ng-scope')).click(); - } - browser.pause(); - - }); - -}); diff --git a/test-main.js b/test-main.js index c329407f93..e006094a24 100644 --- a/test-main.js +++ b/test-main.js @@ -53,7 +53,8 @@ requirejs.config({ "angular": "bower_components/angular/angular.min", "angular-route": "bower_components/angular-route/angular-route.min", "csv": "bower_components/comma-separated-values/csv.min", - "es6-promise": "bower_components/es6-promise/promise.min", + "es6-promise": "bower_components/es6-promise/es6-promise.min", + "html2canvas": "bower_components/html2canvas/build/html2canvas.min", "moment": "bower_components/moment/moment", "moment-duration-format": "bower_components/moment-duration-format/lib/moment-duration-format", "saveAs": "bower_components/FileSaver.js/FileSaver.min",