diff --git a/example/eventGenerator/bundle.js b/example/eventGenerator/bundle.js index 60b91bbb9c7..157fa625420 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/export/bundle.js b/example/export/bundle.js index fca07b789d2..5322d53a832 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 7d6e34b7dc6..a315d7c9c9f 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. -->
- - - - - + +
-
-
-    
-
+        
     
\ No newline at end of file diff --git a/example/forms/src/ExampleFormController.js b/example/forms/src/ExampleFormController.js index dea579f075d..f3f8c95a4e9 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 e4e719149a9..0eadfad5e9e 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 d0304f3f98d..6232229e407 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 f9f004baa49..99c14d305b0 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 15c8191574f..aefc3ffc168 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 9eebd2e3e59..c810f7f6057 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 e5f5cbac6b6..41aee23e63a 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 4a9a67689e3..3d30e84be52 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 8c48d05bee9..b839fa81d63 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 25a78584b15..66a2e819371 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": [ diff --git a/example/profiling/src/DigestIndicator.js b/example/profiling/src/DigestIndicator.js index 1de2d0e9737..826dd2f23ff 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 f999de7e01c..1e9ef5e3867 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 d2f25c8aed0..777fb3d2f55 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/platform/commonUI/browse/bundle.js b/platform/commonUI/browse/bundle.js index e0a5758fff5..5ff13d789e4 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 4a77e62d0b8..44ac390f39b 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 63197ba84fa..aa1415ca81c 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 7b80323fabd..48a64796da8 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 069ecf4a4a0..153175eb002 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 e3c1b935e7c..83327760b04 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/windowing/FullscreenAction.js b/platform/commonUI/browse/src/windowing/FullscreenAction.js index 2882f170795..975562af0ce 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/windowing/FullscreenActionSpec.js b/platform/commonUI/browse/test/windowing/FullscreenActionSpec.js index bf2d520b3ae..913535fa597 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 9df10e0cd07..85a496ce57e 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 8568fe5fb1b..6a2be98d995 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 5a7a48192fa..299d19639ca 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 4d73c59613f..89b8be8242b 100644 --- a/platform/commonUI/dialog/res/templates/overlay-options.html +++ b/platform/commonUI/dialog/res/templates/overlay-options.html @@ -33,7 +33,7 @@ \ No newline at end of file diff --git a/platform/commonUI/edit/bundle.js b/platform/commonUI/edit/bundle.js index 21411104094..2c5a79bda3a 100644 --- a/platform/commonUI/edit/bundle.js +++ b/platform/commonUI/edit/bundle.js @@ -174,7 +174,7 @@ define([ ], "description": "Edit", "category": "view-control", - "glyph": "p" + "cssclass": "major icon-pencil" }, { "key": "properties", @@ -183,7 +183,7 @@ define([ "view-control" ], "implementation": PropertiesAction, - "glyph": "p", + "cssclass": "major icon-pencil", "name": "Edit Properties...", "description": "Edit properties of this object.", "depends": [ @@ -194,7 +194,7 @@ define([ "key": "remove", "category": "contextual", "implementation": RemoveAction, - "glyph": "Z", + "cssclass": "icon-trash", "name": "Remove", "description": "Remove this object from its containing object.", "depends": [ @@ -207,6 +207,7 @@ define([ "category": "conclude-editing", "implementation": SaveAction, "name": "Save", + "cssclass": "icon-save labeled", "description": "Save changes made to these objects.", "depends": [ "dialogService" @@ -217,7 +218,8 @@ define([ "key": "save", "category": "conclude-editing", "implementation": SaveAsAction, - "name": "Save", + "name": "Save As...", + "cssclass": "icon-save labeled", "description": "Save changes made to these objects.", "depends": [ "$injector", @@ -233,6 +235,7 @@ define([ "category": "conclude-editing", "implementation": CancelAction, "name": "Cancel", + "cssclass": "icon-x no-label", "description": "Discard changes made to these objects.", "depends": [] } diff --git a/platform/commonUI/edit/res/templates/create/create-button.html b/platform/commonUI/edit/res/templates/create/create-button.html index 77c6198cae4..8a1e7997833 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