ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-14 13:18:15 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

cssclass is now cssClass

Browse Source 
Make property name consistent with standard camelCase naming.
This commit is contained in:
Pete Richards
2017-02-15 15:02:39 -08:00
parent 46c7399867
commit aaedf5d576
66 changed files with 212 additions and 212 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
docs/src/tutorials/index.md
View File

@ -320,7 +320,7 @@ define([
+ { + {
+ "key": "example.todo", + "key": "example.todo",
+ "name": "To-Do List", + "name": "To-Do List",
+ "cssclass": "icon-check", + "cssClass": "icon-check",
+ "description": "A list of things that need to be done.", + "description": "A list of things that need to be done.",
+ "features": ["creation"] + "features": ["creation"]
+ } + }
@ -340,7 +340,7 @@ Going through the properties we've defined:
domain objects of this type. domain objects of this type.
* The `name` of "To-Do List" is the human-readable name for this type, and will * The `name` of "To-Do List" is the human-readable name for this type, and will
be shown to users. be shown to users.
* The `cssclass` maps to an icon that will be shown for each To-Do List. The icons * The `cssClass` maps to an icon that will be shown for each To-Do List. The icons
are defined in our [custom open MCT icon set](https://github.com/nasa/openmct/blob/master/platform/commonUI/general/res/sass/_glyphs.scss). are defined in our [custom open MCT icon set](https://github.com/nasa/openmct/blob/master/platform/commonUI/general/res/sass/_glyphs.scss).
A complete list of available icons will be provided in the future. A complete list of available icons will be provided in the future.
* The `description` is also human-readable, and will be used whenever a longer * The `description` is also human-readable, and will be used whenever a longer
@ -416,7 +416,7 @@ define([
{ {
"key": "example.todo", "key": "example.todo",
"name": "To-Do List", "name": "To-Do List",
"cssclass": "icon-check", "cssClass": "icon-check",
"description": "A list of things that need to be done.", "description": "A list of things that need to be done.",
"features": ["creation"] "features": ["creation"]
} }
@ -425,7 +425,7 @@ define([
+ { + {
+ "key": "example.todo", + "key": "example.todo",
+ "type": "example.todo", + "type": "example.todo",
+ "cssclass": "icon-check", + "cssClass": "icon-check",
+ "name": "List", + "name": "List",
+ "templateUrl": "templates/todo.html", + "templateUrl": "templates/todo.html",
+ "editable": true + "editable": true
@ -447,7 +447,7 @@ the domain object type, but could have chosen any unique name.
domain objects of that type. This means that we'll see this view for To-do Lists domain objects of that type. This means that we'll see this view for To-do Lists
that we create, but not for other domain objects (such as Folders.) that we create, but not for other domain objects (such as Folders.)
* The `cssclass` and `name` properties describe the icon and human-readable name * The `cssClass` and `name` properties describe the icon and human-readable name
for this view to display in the UI where needed (if multiple views are available for this view to display in the UI where needed (if multiple views are available
for To-do Lists, the user will be able to choose one.) for To-do Lists, the user will be able to choose one.)
@ -473,7 +473,7 @@ define([
{ {
"key": "example.todo", "key": "example.todo",
"name": "To-Do List", "name": "To-Do List",
"cssclass": "icon-check", "cssClass": "icon-check",
"description": "A list of things that need to be done.", "description": "A list of things that need to be done.",
"features": ["creation"], "features": ["creation"],
+ "model": { + "model": {
@ -488,7 +488,7 @@ define([
{ {
"key": "example.todo", "key": "example.todo",
"type": "example.todo", "type": "example.todo",
"cssclass": "icon-check", "cssClass": "icon-check",
"name": "List", "name": "List",
"templateUrl": "templates/todo.html", "templateUrl": "templates/todo.html",
"editable": true "editable": true
@ -647,7 +647,7 @@ define([
{ {
"key": "example.todo", "key": "example.todo",
"name": "To-Do List", "name": "To-Do List",
"cssclass": "icon-check", "cssClass": "icon-check",
"description": "A list of things that need to be done.", "description": "A list of things that need to be done.",
"features": ["creation"], "features": ["creation"],
"model": { "model": {
@ -662,7 +662,7 @@ define([
{ {
"key": "example.todo", "key": "example.todo",
"type": "example.todo", "type": "example.todo",
"cssclass": "icon-check", "cssClass": "icon-check",
"name": "List", "name": "List",
"templateUrl": "templates/todo.html", "templateUrl": "templates/todo.html",
"editable": true "editable": true
@ -741,7 +741,7 @@ define([
{ {
"key": "example.todo", "key": "example.todo",
"name": "To-Do List", "name": "To-Do List",
"cssclass": "icon-check", "cssClass": "icon-check",
"description": "A list of things that need to be done.", "description": "A list of things that need to be done.",
"features": ["creation"], "features": ["creation"],
"model": { "model": {
@ -756,7 +756,7 @@ define([
{ {
"key": "example.todo", "key": "example.todo",
"type": "example.todo", "type": "example.todo",
"cssclass": "icon-check", "cssClass": "icon-check",
"name": "List", "name": "List",
"templateUrl": "templates/todo.html", "templateUrl": "templates/todo.html",
"editable": true, "editable": true,
@ -766,7 +766,7 @@ define([
+ "items": [ + "items": [
+ { + {
+ "text": "Add Task", + "text": "Add Task",
+ "cssclass": "icon-plus", + "cssClass": "icon-plus",
+ "method": "addTask", + "method": "addTask",
+ "control": "button" + "control": "button"
+ } + }
@ -775,7 +775,7 @@ define([
+ { + {
+ "items": [ + "items": [
+ { + {
+ "cssclass": "icon-trash", + "cssClass": "icon-trash",
+ "method": "removeTask", + "method": "removeTask",
+ "control": "button" + "control": "button"
+ } + }
@ -971,7 +971,7 @@ define([
{ {
"key": "example.todo", "key": "example.todo",
"name": "To-Do List", "name": "To-Do List",
"cssclass": "icon-check", "cssClass": "icon-check",
"description": "A list of things that need to be done.", "description": "A list of things that need to be done.",
"features": ["creation"], "features": ["creation"],
"model": { "model": {
@ -986,7 +986,7 @@ define([
{ {
"key": "example.todo", "key": "example.todo",
"type": "example.todo", "type": "example.todo",
"cssclass": "icon-check", "cssClass": "icon-check",
"name": "List", "name": "List",
"templateUrl": "templates/todo.html", "templateUrl": "templates/todo.html",
"editable": true, "editable": true,
@ -996,7 +996,7 @@ define([
"items": [ "items": [
{ {
"text": "Add Task", "text": "Add Task",
"cssclass": "icon-plus", "cssClass": "icon-plus",
"method": "addTask", "method": "addTask",
"control": "button" "control": "button"
} }
@ -1005,7 +1005,7 @@ define([
{ {
"items": [ "items": [
{ {
"cssclass": "icon-trash", "cssClass": "icon-trash",
"method": "removeTask", "method": "removeTask",
"control": "button" "control": "button"
} }
@ -1236,7 +1236,7 @@ define([
{ {
"key": "example.todo", "key": "example.todo",
"name": "To-Do List", "name": "To-Do List",
"cssclass": "icon-check", "cssClass": "icon-check",
"description": "A list of things that need to be done.", "description": "A list of things that need to be done.",
"features": ["creation"], "features": ["creation"],
"model": { "model": {
@ -1248,7 +1248,7 @@ define([
{ {
"key": "example.todo", "key": "example.todo",
"type": "example.todo", "type": "example.todo",
"cssclass": "icon-check", "cssClass": "icon-check",
"name": "List", "name": "List",
"templateUrl": "templates/todo.html", "templateUrl": "templates/todo.html",
"editable": true, "editable": true,
@ -1258,7 +1258,7 @@ define([
"items": [ "items": [
{ {
"text": "Add Task", "text": "Add Task",
"cssclass": "icon-plus", "cssClass": "icon-plus",
"method": "addTask", "method": "addTask",
"control": "button" "control": "button"
} }
@ -1267,7 +1267,7 @@ define([
{ {
"items": [ "items": [
{ {
"cssclass": "icon-trash", "cssClass": "icon-trash",
"method": "removeTask", "method": "removeTask",
"control": "button" "control": "button"
} }
@ -1374,7 +1374,7 @@ define([
{ {
"name": "Bar Graph", "name": "Bar Graph",
"key": "example.bargraph", "key": "example.bargraph",
"cssclass": "icon-autoflow-tabular", "cssClass": "icon-autoflow-tabular",
"templateUrl": "templates/bargraph.html", "templateUrl": "templates/bargraph.html",
"needs": [ "telemetry" ], "needs": [ "telemetry" ],
"delegation": true "delegation": true
@ -1677,7 +1677,7 @@ define([
{ {
"name": "Bar Graph", "name": "Bar Graph",
"key": "example.bargraph", "key": "example.bargraph",
"cssclass": "icon-autoflow-tabular", "cssClass": "icon-autoflow-tabular",
"templateUrl": "templates/bargraph.html", "templateUrl": "templates/bargraph.html",
"needs": [ "telemetry" ], "needs": [ "telemetry" ],
"delegation": true "delegation": true
@ -1843,7 +1843,7 @@ define([
{ {
"name": "Bar Graph", "name": "Bar Graph",
"key": "example.bargraph", "key": "example.bargraph",
"cssclass": "icon-autoflow-tabular", "cssClass": "icon-autoflow-tabular",
"templateUrl": "templates/bargraph.html", "templateUrl": "templates/bargraph.html",
"needs": [ "telemetry" ], "needs": [ "telemetry" ],
"delegation": true, "delegation": true,
@ -2320,7 +2320,7 @@ define([
{ {
"name": "Spacecraft", "name": "Spacecraft",
"key": "example.spacecraft", "key": "example.spacecraft",
"cssclass": "icon-object" "cssClass": "icon-object"
} }
], ],
"roots": [ "roots": [
@ -2706,18 +2706,18 @@ define([
{ {
"name": "Spacecraft", "name": "Spacecraft",
"key": "example.spacecraft", "key": "example.spacecraft",
"cssclass": "icon-object" "cssClass": "icon-object"
}, },
+ { + {
+ "name": "Subsystem", + "name": "Subsystem",
+ "key": "example.subsystem", + "key": "example.subsystem",
+ "cssclass": "icon-object", + "cssClass": "icon-object",
+ "model": { "composition": [] } + "model": { "composition": [] }
+ }, + },
+ { + {
+ "name": "Measurement", + "name": "Measurement",
+ "key": "example.measurement", + "key": "example.measurement",
+ "cssclass": "icon-telemetry", + "cssClass": "icon-telemetry",
+ "model": { "telemetry": {} }, + "model": { "telemetry": {} },
+ "telemetry": { + "telemetry": {
+ "source": "example.source", + "source": "example.source",
@ -3031,18 +3031,18 @@ define([
{ {
"name": "Spacecraft", "name": "Spacecraft",
"key": "example.spacecraft", "key": "example.spacecraft",
"cssclass": "icon-object" "cssClass": "icon-object"
}, },
{ {
"name": "Subsystem", "name": "Subsystem",
"key": "example.subsystem", "key": "example.subsystem",
"cssclass": "icon-object", "cssClass": "icon-object",
"model": { "composition": [] } "model": { "composition": [] }
}, },
{ {
"name": "Measurement", "name": "Measurement",
"key": "example.measurement", "key": "example.measurement",
"cssclass": "icon-telemetry", "cssClass": "icon-telemetry",
"model": { "telemetry": {} }, "model": { "telemetry": {} },
"telemetry": { "telemetry": {
"source": "example.source", "source": "example.source",

2
example/eventGenerator/bundle.js
View File

@ -49,7 +49,7 @@ define([
{ {
"key": "eventGenerator", "key": "eventGenerator",
"name": "Event Message Generator", "name": "Event Message Generator",
"cssclass": "icon-folder-new", "cssClass": "icon-folder-new",
"description": "For development use. Creates sample event message data that mimics a live data stream.", "description": "For development use. Creates sample event message data that mimics a live data stream.",
"priority": 10, "priority": 10,
"features": "creation", "features": "creation",

2
example/export/bundle.js
View File

@ -36,7 +36,7 @@ define([
"name": "Export Telemetry as CSV", "name": "Export Telemetry as CSV",
"implementation": ExportTelemetryAsCSVAction, "implementation": ExportTelemetryAsCSVAction,
"category": "contextual", "category": "contextual",
"cssclass": "icon-download", "cssClass": "icon-download",
"depends": [ "exportService" ] "depends": [ "exportService" ]
} }
] ]

10
example/generator/bundle.js
View File

@ -86,7 +86,7 @@ define([
{ {
"key": "generator", "key": "generator",
"name": "Sine Wave Generator", "name": "Sine Wave Generator",
"cssclass": "icon-telemetry", "cssClass": "icon-telemetry",
"description": "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.", "description": "For development use. Generates example streaming telemetry data using a simple sine wave algorithm.",
"priority": 10, "priority": 10,
"features": "creation", "features": "creation",
@ -130,7 +130,7 @@ define([
{ {
"name": "Period", "name": "Period",
"control": "textfield", "control": "textfield",
"cssclass": "l-input-sm l-numeric", "cssClass": "l-input-sm l-numeric",
"key": "period", "key": "period",
"required": true, "required": true,
"property": [ "property": [
@ -142,7 +142,7 @@ define([
{ {
"name": "Amplitude", "name": "Amplitude",
"control": "textfield", "control": "textfield",
"cssclass": "l-input-sm l-numeric", "cssClass": "l-input-sm l-numeric",
"key": "amplitude", "key": "amplitude",
"required": true, "required": true,
"property": [ "property": [
@ -154,7 +154,7 @@ define([
{ {
"name": "Offset", "name": "Offset",
"control": "textfield", "control": "textfield",
"cssclass": "l-input-sm l-numeric", "cssClass": "l-input-sm l-numeric",
"key": "offset", "key": "offset",
"required": true, "required": true,
"property": [ "property": [
@ -166,7 +166,7 @@ define([
{ {
"name": "Data Rate (hz)", "name": "Data Rate (hz)",
"control": "textfield", "control": "textfield",
"cssclass": "l-input-sm l-numeric", "cssClass": "l-input-sm l-numeric",
"key": "dataRateInHz", "key": "dataRateInHz",
"required": true, "required": true,
"property": [ "property": [

2
example/imagery/bundle.js
View File

@ -49,7 +49,7 @@ define([
{ {
"key": "imagery", "key": "imagery",
"name": "Example Imagery", "name": "Example Imagery",
"cssclass": "icon-image", "cssClass": "icon-image",
"features": "creation", "features": "creation",
"description": "For development use. Creates example imagery data that mimics a live imagery stream.", "description": "For development use. Creates example imagery data that mimics a live imagery stream.",
"priority": 10, "priority": 10,

2
example/localTimeSystem/src/LADTickSource.js
View File

@ -31,7 +31,7 @@ define(['../../../platform/features/conductor/core/src/timeSystems/LocalClock'],
this.metadata = { this.metadata = {
key: 'test-lad', key: 'test-lad',
mode: 'lad', mode: 'lad',
cssclass: 'icon-clock', cssClass: 'icon-clock',
label: 'Latest Available Data', label: 'Latest Available Data',
name: 'Latest available data', name: 'Latest available data',
description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will automatically advance themselves based on a UTC clock.' description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will automatically advance themselves based on a UTC clock.'

6
example/msl/bundle.js
View File

@ -41,18 +41,18 @@ define([
{ {
"name":"Mars Science Laboratory", "name":"Mars Science Laboratory",
"key": "msl.curiosity", "key": "msl.curiosity",
"cssclass": "icon-object" "cssClass": "icon-object"
}, },
{ {
"name": "Instrument", "name": "Instrument",
"key": "msl.instrument", "key": "msl.instrument",
"cssclass": "icon-object", "cssClass": "icon-object",
"model": {"composition": []} "model": {"composition": []}
}, },
{ {
"name": "Measurement", "name": "Measurement",
"key": "msl.measurement", "key": "msl.measurement",
"cssclass": "icon-telemetry", "cssClass": "icon-telemetry",
"model": {"telemetry": {}}, "model": {"telemetry": {}},
"telemetry": { "telemetry": {
"source": "rems.source", "source": "rems.source",

4
example/plotOptions/bundle.js
View File

@ -81,7 +81,7 @@ define([
{ {
"key": "plot", "key": "plot",
"name": "Example Telemetry Plot", "name": "Example Telemetry Plot",
"cssclass": "icon-telemetry-panel", "cssClass": "icon-telemetry-panel",
"description": "For development use. A plot for displaying telemetry.", "description": "For development use. A plot for displaying telemetry.",
"priority": 10, "priority": 10,
"delegates": [ "delegates": [
@ -129,7 +129,7 @@ define([
{ {
"name": "Period", "name": "Period",
"control": "textfield", "control": "textfield",
"cssclass": "l-input-sm l-numeric", "cssClass": "l-input-sm l-numeric",
"key": "period", "key": "period",
"required": true, "required": true,
"property": [ "property": [

2
example/profiling/src/DigestIndicator.js
View File

@ -63,7 +63,7 @@ define(
* Get the CSS class that defines the icon * Get the CSS class that defines the icon
* to display in this indicator. This will appear * to display in this indicator. This will appear
* as a dataflow icon. * as a dataflow icon.
* @returns {string} the cssclass of the dataflow icon * @returns {string} the cssClass of the dataflow icon
*/ */
getCssClass: function () { getCssClass: function () {
return "icon-connectivity"; return "icon-connectivity";

4
platform/commonUI/browse/bundle.js
View File

@ -226,7 +226,7 @@ define([
"$window" "$window"
], ],
"group": "windowing", "group": "windowing",
"cssclass": "icon-new-window", "cssClass": "icon-new-window",
"priority": "preferred" "priority": "preferred"
}, },
{ {
@ -241,7 +241,7 @@ define([
{ {
"key": "items", "key": "items",
"name": "Items", "name": "Items",
"cssclass": "icon-thumbs-strip", "cssClass": "icon-thumbs-strip",
"description": "Grid of available items", "description": "Grid of available items",
"template": itemsTemplate, "template": itemsTemplate,
"uses": [ "uses": [

4
platform/commonUI/browse/src/windowing/FullscreenAction.js
View File

@ -46,12 +46,12 @@ define(
}; };
FullscreenAction.prototype.getMetadata = function () { FullscreenAction.prototype.getMetadata = function () {
// We override getMetadata, because the icon cssclass and // We override getMetadata, because the icon cssClass and
// description need to be determined at run-time // description need to be determined at run-time
// based on whether or not we are currently // based on whether or not we are currently
// full screen. // full screen.
var metadata = Object.create(FullscreenAction); var metadata = Object.create(FullscreenAction);
metadata.cssclass = screenfull.isFullscreen ? "icon-fullscreen-expand" : "icon-fullscreen-collapse"; metadata.cssClass = screenfull.isFullscreen ? "icon-fullscreen-expand" : "icon-fullscreen-collapse";
metadata.description = screenfull.isFullscreen ? metadata.description = screenfull.isFullscreen ?
EXIT_FULLSCREEN : ENTER_FULLSCREEN; EXIT_FULLSCREEN : ENTER_FULLSCREEN;
metadata.group = "windowing"; metadata.group = "windowing";

2
platform/commonUI/browse/test/windowing/FullscreenActionSpec.js
View File

@ -51,7 +51,7 @@ define(
}); });
it("provides displayable metadata", function () { it("provides displayable metadata", function () {
expect(action.getMetadata().cssclass).toBeDefined(); expect(action.getMetadata().cssClass).toBeDefined();
}); });
}); });

14
platform/commonUI/edit/bundle.js
View File

@ -163,7 +163,7 @@ define([
], ],
"description": "Edit", "description": "Edit",
"category": "view-control", "category": "view-control",
"cssclass": "major icon-pencil" "cssClass": "major icon-pencil"
}, },
{ {
"key": "properties", "key": "properties",
@ -172,7 +172,7 @@ define([
"view-control" "view-control"
], ],
"implementation": PropertiesAction, "implementation": PropertiesAction,
"cssclass": "major icon-pencil", "cssClass": "major icon-pencil",
"name": "Edit Properties...", "name": "Edit Properties...",
"description": "Edit properties of this object.", "description": "Edit properties of this object.",
"depends": [ "depends": [
@ -183,7 +183,7 @@ define([
"key": "remove", "key": "remove",
"category": "contextual", "category": "contextual",
"implementation": RemoveAction, "implementation": RemoveAction,
"cssclass": "icon-trash", "cssClass": "icon-trash",
"name": "Remove", "name": "Remove",
"description": "Remove this object from its containing object.", "description": "Remove this object from its containing object.",
"depends": [ "depends": [
@ -195,7 +195,7 @@ define([
"category": "save", "category": "save",
"implementation": SaveAndStopEditingAction, "implementation": SaveAndStopEditingAction,
"name": "Save and Finish Editing", "name": "Save and Finish Editing",
"cssclass": "icon-save labeled", "cssClass": "icon-save labeled",
"description": "Save changes made to these objects.", "description": "Save changes made to these objects.",
"depends": [ "depends": [
"dialogService", "dialogService",
@ -207,7 +207,7 @@ define([
"category": "save", "category": "save",
"implementation": SaveAction, "implementation": SaveAction,
"name": "Save and Continue Editing", "name": "Save and Continue Editing",
"cssclass": "icon-save labeled", "cssClass": "icon-save labeled",
"description": "Save changes made to these objects.", "description": "Save changes made to these objects.",
"depends": [ "depends": [
"dialogService", "dialogService",
@ -219,7 +219,7 @@ define([
"category": "save", "category": "save",
"implementation": SaveAsAction, "implementation": SaveAsAction,
"name": "Save As...", "name": "Save As...",
"cssclass": "icon-save labeled", "cssClass": "icon-save labeled",
"description": "Save changes made to these objects.", "description": "Save changes made to these objects.",
"depends": [ "depends": [
"$injector", "$injector",
@ -237,7 +237,7 @@ define([
// Because we use the name as label for edit buttons and mct-control buttons need // 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. // the label to be set to undefined in order to not apply the labeled CSS rule.
"name": undefined, "name": undefined,
"cssclass": "icon-x no-label", "cssClass": "icon-x no-label",
"description": "Discard changes made to these objects.", "description": "Discard changes made to these objects.",
"depends": [] "depends": []
} }

4
platform/commonUI/edit/res/templates/create/create-menu.html
View File

@ -25,14 +25,14 @@
<li ng-repeat="createAction in createActions" ng-click="createAction.perform()"> <li ng-repeat="createAction in createActions" ng-click="createAction.perform()">
<a ng-mouseover="representation.activeMetadata = createAction.getMetadata()" <a ng-mouseover="representation.activeMetadata = createAction.getMetadata()"
ng-mouseleave="representation.activeMetadata = undefined" ng-mouseleave="representation.activeMetadata = undefined"
class="menu-item-a {{ createAction.getMetadata().cssclass }}"> class="menu-item-a {{ createAction.getMetadata().cssClass }}">
{{createAction.getMetadata().name}} {{createAction.getMetadata().name}}
</a> </a>
</li> </li>
</ul> </ul>
</div> </div>
<div class="pane right menu-item-description"> <div class="pane right menu-item-description">
<div class="desc-area icon {{ representation.activeMetadata.cssclass }}"></div> <div class="desc-area icon {{ representation.activeMetadata.cssClass }}"></div>
<div class="desc-area title"> <div class="desc-area title">
{{representation.activeMetadata.name}} {{representation.activeMetadata.name}}
</div> </div>

6
platform/commonUI/edit/res/templates/edit-action-buttons.html
View File

@ -26,7 +26,7 @@
structure="{ structure="{
text: saveActions[0].getMetadata().name, text: saveActions[0].getMetadata().name,
click: actionPerformer(saveActions[0]), click: actionPerformer(saveActions[0]),
cssclass: 'major ' + saveActions[0].getMetadata().cssclass cssClass: 'major ' + saveActions[0].getMetadata().cssClass
}"> }">
</mct-control> </mct-control>
</span> </span>
@ -36,7 +36,7 @@
structure="{ structure="{
options: saveActionsAsMenuOptions, options: saveActionsAsMenuOptions,
click: saveActionMenuClickHandler, click: saveActionMenuClickHandler,
cssclass: 'btn-bar right icon-save no-label major' cssClass: 'btn-bar right icon-save no-label major'
}"> }">
</mct-control> </mct-control>
</span> </span>
@ -46,7 +46,7 @@
structure="{ structure="{
text: currentAction.getMetadata().name, text: currentAction.getMetadata().name,
click: actionPerformer(currentAction), click: actionPerformer(currentAction),
cssclass: currentAction.getMetadata().cssclass cssClass: currentAction.getMetadata().cssClass
}"> }">
</mct-control> </mct-control>
</span> </span>

2
platform/commonUI/edit/src/controllers/EditActionController.js
View File

@ -41,7 +41,7 @@ define(
return { return {
key: action, key: action,
name: action.getMetadata().name, name: action.getMetadata().name,
cssclass: action.getMetadata().cssclass cssClass: action.getMetadata().cssClass
}; };
} }

2
platform/commonUI/edit/src/creation/AddAction.js
View File

@ -51,7 +51,7 @@ define(
function AddAction(type, parent, context, $q, dialogService, policyService) { function AddAction(type, parent, context, $q, dialogService, policyService) {
this.metadata = { this.metadata = {
key: 'add', key: 'add',
cssclass: type.getCssClass(), cssClass: type.getCssClass(),
name: type.getName(), name: type.getName(),
type: type.getKey(), type: type.getKey(),
description: type.getDescription(), description: type.getDescription(),

2
platform/commonUI/edit/src/creation/CreateAction.js
View File

@ -47,7 +47,7 @@ define(
function CreateAction(type, parent, context) { function CreateAction(type, parent, context) {
this.metadata = { this.metadata = {
key: 'create', key: 'create',
cssclass: type.getCssClass(), cssClass: type.getCssClass(),
name: type.getName(), name: type.getName(),
type: type.getKey(), type: type.getKey(),
description: type.getDescription(), description: type.getDescription(),

2
platform/commonUI/edit/src/creation/CreateWizard.js
View File

@ -91,7 +91,7 @@ define(
if (includeLocation) { if (includeLocation) {
sections.push({ sections.push({
name: 'Location', name: 'Location',
cssclass: "grows", cssClass: "grows",
rows: [{ rows: [{
name: "Save In", name: "Save In",
control: "locator", control: "locator",

4
platform/commonUI/edit/test/controllers/EditActionControllerSpec.js
View File

@ -28,7 +28,7 @@ define(
describe("The Edit Action controller", function () { describe("The Edit Action controller", function () {
var mockSaveActionMetadata = { var mockSaveActionMetadata = {
name: "mocked-save-action", name: "mocked-save-action",
cssclass: "mocked-save-action-css" cssClass: "mocked-save-action-css"
}; };
function fakeGetActions(actionContext) { function fakeGetActions(actionContext) {
@ -86,7 +86,7 @@ define(
expect(menuOptions[1].key).toEqual(mockScope.saveActions[1]); expect(menuOptions[1].key).toEqual(mockScope.saveActions[1]);
menuOptions.forEach(function (option) { menuOptions.forEach(function (option) {
expect(option.name).toEqual(mockSaveActionMetadata.name); expect(option.name).toEqual(mockSaveActionMetadata.name);
expect(option.cssclass).toEqual(mockSaveActionMetadata.cssclass); expect(option.cssClass).toEqual(mockSaveActionMetadata.cssClass);
}); });
}); });

2
platform/commonUI/edit/test/creation/CreateActionSpec.js
View File

@ -138,7 +138,7 @@ define(
expect(metadata.name).toEqual("Test"); expect(metadata.name).toEqual("Test");
expect(metadata.description).toEqual("a test type"); expect(metadata.description).toEqual("a test type");
expect(metadata.cssclass).toEqual("icon-telemetry"); expect(metadata.cssClass).toEqual("icon-telemetry");
}); });
describe("the perform function", function () { describe("the perform function", function () {

2
platform/commonUI/general/res/templates/controls/action-button.html
View File

@ -19,7 +19,7 @@
this source code distribution or the Licensing information page available this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information. at runtime from the About dialog for additional information.
--> -->
<a class="s-button key-{{parameters.action.getMetadata().key}} {{parameters.action.getMetadata().cssclass}}" <a class="s-button key-{{parameters.action.getMetadata().key}} {{parameters.action.getMetadata().cssClass}}"
ng-class="{ labeled: parameters.labeled }" ng-class="{ labeled: parameters.labeled }"
title="{{parameters.action.getMetadata().description}}" title="{{parameters.action.getMetadata().description}}"
ng-click="parameters.action.perform()"> ng-click="parameters.action.perform()">

4
platform/commonUI/general/res/templates/controls/switcher.html
View File

@ -20,7 +20,7 @@
at runtime from the About dialog for additional information. at runtime from the About dialog for additional information.
--> -->
<span ng-controller="ViewSwitcherController"> <span ng-controller="ViewSwitcherController">
<div class="view-switcher menu-element s-menu-button {{ngModel.selected.cssclass}}" <div class="view-switcher menu-element s-menu-button {{ngModel.selected.cssClass}}"
ng-if="view.length > 1" ng-if="view.length > 1"
ng-controller="ClickAwayController as toggle"> ng-controller="ClickAwayController as toggle">
@ -33,7 +33,7 @@
<ul> <ul>
<li ng-repeat="option in view" <li ng-repeat="option in view"
ng-click="ngModel.selected = option; toggle.setState(false)" ng-click="ngModel.selected = option; toggle.setState(false)"
class="{{option.cssclass}}"> class="{{option.cssClass}}">
{{option.name}} {{option.name}}
</li> </li>
</ul> </ul>

2
platform/commonUI/general/res/templates/menu/context-menu.html
View File

@ -25,7 +25,7 @@
<li ng-repeat="menuAction in menuActions" <li ng-repeat="menuAction in menuActions"
ng-click="menuAction.perform()" ng-click="menuAction.perform()"
title="{{menuAction.getMetadata().description}}" title="{{menuAction.getMetadata().description}}"
class="{{menuAction.getMetadata().cssclass}}"> class="{{menuAction.getMetadata().cssClass}}">
{{menuAction.getMetadata().name}} {{menuAction.getMetadata().name}}
</li> </li>
</ul> </ul>

12
platform/core/bundle.js
View File

@ -241,7 +241,7 @@ define([
"property": "name", "property": "name",
"pattern": "\\S+", "pattern": "\\S+",
"required": true, "required": true,
"cssclass": "l-input-lg" "cssClass": "l-input-lg"
}, },
{ {
"name": "Notes", "name": "Notes",
@ -249,19 +249,19 @@ define([
"property": "notes", "property": "notes",
"control": "textarea", "control": "textarea",
"required": false, "required": false,
"cssclass": "l-textarea-sm" "cssClass": "l-textarea-sm"
} }
] ]
}, },
{ {
"key": "root", "key": "root",
"name": "Root", "name": "Root",
"cssclass": "icon-folder" "cssClass": "icon-folder"
}, },
{ {
"key": "folder", "key": "folder",
"name": "Folder", "name": "Folder",
"cssclass": "icon-folder", "cssClass": "icon-folder",
"features": "creation", "features": "creation",
"description": "Create folders to organize other objects or links to objects.", "description": "Create folders to organize other objects or links to objects.",
"priority": 1000, "priority": 1000,
@ -272,11 +272,11 @@ define([
{ {
"key": "unknown", "key": "unknown",
"name": "Unknown Type", "name": "Unknown Type",
"cssclass": "icon-object-unknown" "cssClass": "icon-object-unknown"
}, },
{ {
"name": "Unknown Type", "name": "Unknown Type",
"cssclass": "icon-object-unknown" "cssClass": "icon-object-unknown"
} }
], ],
"capabilities": [ "capabilities": [

2
platform/core/src/actions/ActionAggregator.js
View File

@ -58,7 +58,7 @@ define(
* @property {string} key machine-readable identifier for this action * @property {string} key machine-readable identifier for this action
* @property {string} name human-readable name for this action * @property {string} name human-readable name for this action
* @property {string} description human-readable description * @property {string} description human-readable description
* @property {string} cssclass CSS class for icon * @property {string} cssClass CSS class for icon
* @property {ActionContext} context the context in which the action * @property {ActionContext} context the context in which the action
* will be performed. * will be performed.
*/ */

6
platform/core/src/types/TypeImpl.js
View File

@ -56,12 +56,12 @@ define(
* @method Type#getDescription * @method Type#getDescription
*/ */
/** /**
* Get the cssclass associated with this type. cssclass is a * Get the cssClass associated with this type. cssClass is a
* string which will appear as an icon (when * string which will appear as an icon (when
* displayed in an appropriate font) which visually * displayed in an appropriate font) which visually
* distinguish types from one another. * distinguish types from one another.
* *
* @returns {string} the cssclass for this type * @returns {string} the cssClass for this type
* @method Type#getCssClass * @method Type#getCssClass
*/ */
/** /**
@ -145,7 +145,7 @@ define(
}; };
TypeImpl.prototype.getCssClass = function () { TypeImpl.prototype.getCssClass = function () {
return this.typeDef.cssclass; return this.typeDef.cssClass;
}; };
TypeImpl.prototype.getProperties = function () { TypeImpl.prototype.getProperties = function () {

2
platform/core/test/types/TypeImplSpec.js
View File

@ -33,7 +33,7 @@ define(
key: 'test-type', key: 'test-type',
name: 'Test Type', name: 'Test Type',
description: 'A type, for testing', description: 'A type, for testing',
cssclass: 'icon-telemetry-panel', cssClass: 'icon-telemetry-panel',
inherits: ['test-parent-1', 'test-parent-2'], inherits: ['test-parent-1', 'test-parent-2'],
features: ['test-feature-1'], features: ['test-feature-1'],
properties: [{}], properties: [{}],

6
platform/core/test/types/TypeProviderSpec.js
View File

@ -30,18 +30,18 @@ define(
testTypeDefinitions = [ testTypeDefinitions = [
{ {
key: 'basic', key: 'basic',
cssclass: "icon-magnify-in", cssClass: "icon-magnify-in",
name: "Basic Type" name: "Basic Type"
}, },
{ {
key: 'multi1', key: 'multi1',
cssclass: "icon-trash", cssClass: "icon-trash",
description: "Multi1 Description", description: "Multi1 Description",
capabilities: ['a1', 'b1'] capabilities: ['a1', 'b1']
}, },
{ {
key: 'multi2', key: 'multi2',
cssclass: "icon-magnify-out", cssClass: "icon-magnify-out",
capabilities: ['a2', 'b2', 'c2'] capabilities: ['a2', 'b2', 'c2']
}, },
{ {

10
platform/entanglement/bundle.js
View File

@ -66,7 +66,7 @@ define([
"key": "move", "key": "move",
"name": "Move", "name": "Move",
"description": "Move object to another location.", "description": "Move object to another location.",
"cssclass": "icon-move", "cssClass": "icon-move",
"category": "contextual", "category": "contextual",
"implementation": MoveAction, "implementation": MoveAction,
"depends": [ "depends": [
@ -79,7 +79,7 @@ define([
"key": "copy", "key": "copy",
"name": "Duplicate", "name": "Duplicate",
"description": "Duplicate object to another location.", "description": "Duplicate object to another location.",
"cssclass": "icon-duplicate", "cssClass": "icon-duplicate",
"category": "contextual", "category": "contextual",
"implementation": CopyAction, "implementation": CopyAction,
"depends": [ "depends": [
@ -95,7 +95,7 @@ define([
"key": "link", "key": "link",
"name": "Create Link", "name": "Create Link",
"description": "Create Link to object in another location.", "description": "Create Link to object in another location.",
"cssclass": "icon-link", "cssClass": "icon-link",
"category": "contextual", "category": "contextual",
"implementation": LinkAction, "implementation": LinkAction,
"depends": [ "depends": [
@ -108,7 +108,7 @@ define([
"key": "follow", "key": "follow",
"name": "Go To Original", "name": "Go To Original",
"description": "Go to the original, un-linked instance of this object.", "description": "Go to the original, un-linked instance of this object.",
"cssclass": "", "cssClass": "",
"category": "contextual", "category": "contextual",
"implementation": GoToOriginalAction "implementation": GoToOriginalAction
}, },
@ -116,7 +116,7 @@ define([
"key": "locate", "key": "locate",
"name": "Set Primary Location", "name": "Set Primary Location",
"description": "Set a domain object's primary location.", "description": "Set a domain object's primary location.",
"cssclass": "", "cssClass": "",
"category": "contextual", "category": "contextual",
"implementation": SetPrimaryLocationAction "implementation": SetPrimaryLocationAction
} }

2
platform/entanglement/src/services/LocationService.js
View File

@ -58,7 +58,7 @@ define(
sections: [ sections: [
{ {
name: 'Location', name: 'Location',
cssclass: "grows", cssClass: "grows",
rows: [ rows: [
{ {
name: label, name: label,

12
platform/features/clock/bundle.js
View File

@ -136,7 +136,7 @@ define([
], ],
"category": "contextual", "category": "contextual",
"name": "Start", "name": "Start",
"cssclass": "icon-play", "cssClass": "icon-play",
"priority": "preferred" "priority": "preferred"
}, },
{ {
@ -147,7 +147,7 @@ define([
], ],
"category": "contextual", "category": "contextual",
"name": "Restart at 0", "name": "Restart at 0",
"cssclass": "icon-refresh", "cssClass": "icon-refresh",
"priority": "preferred" "priority": "preferred"
} }
], ],
@ -155,7 +155,7 @@ define([
{ {
"key": "clock", "key": "clock",
"name": "Clock", "name": "Clock",
"cssclass": "icon-clock", "cssClass": "icon-clock",
"description": "A UTC-based clock that supports a variety of display formats. Clocks can be added to Display Layouts.", "description": "A UTC-based clock that supports a variety of display formats. Clocks can be added to Display Layouts.",
"priority": 101, "priority": 101,
"features": [ "features": [
@ -183,7 +183,7 @@ define([
"name": "hh:mm:ss" "name": "hh:mm:ss"
} }
], ],
"cssclass": "l-inline" "cssClass": "l-inline"
}, },
{ {
"control": "select", "control": "select",
@ -197,7 +197,7 @@ define([
"name": "24hr" "name": "24hr"
} }
], ],
"cssclass": "l-inline" "cssClass": "l-inline"
} }
] ]
} }
@ -212,7 +212,7 @@ define([
{ {
"key": "timer", "key": "timer",
"name": "Timer", "name": "Timer",
"cssclass": "icon-timer", "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.", "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, "priority": 100,
"features": [ "features": [

4
platform/features/clock/src/controllers/TimerController.js
View File

@ -131,11 +131,11 @@ define(
/** /**
* Get the CSS class to display the right icon * Get the CSS class to display the right icon
* for the start/restart button. * for the start/restart button.
* @returns {string} cssclass to display * @returns {string} cssClass to display
*/ */
TimerController.prototype.buttonCssClass = function () { TimerController.prototype.buttonCssClass = function () {
return this.relevantAction ? return this.relevantAction ?
this.relevantAction.getMetadata().cssclass : ""; this.relevantAction.getMetadata().cssClass : "";
}; };
/** /**

6
platform/features/clock/test/controllers/TimerControllerSpec.js
View File

@ -85,8 +85,8 @@ define(
'timer.restart': mockRestart 'timer.restart': mockRestart
}[k]]; }[k]];
}); });
mockStart.getMetadata.andReturn({ cssclass: "icon-play", name: "Start" }); mockStart.getMetadata.andReturn({ cssClass: "icon-play", name: "Start" });
mockRestart.getMetadata.andReturn({ cssclass: "icon-refresh", name: "Restart" }); mockRestart.getMetadata.andReturn({ cssClass: "icon-refresh", name: "Restart" });
mockScope.domainObject = mockDomainObject; mockScope.domainObject = mockDomainObject;
testModel = {}; testModel = {};
@ -144,7 +144,7 @@ define(
expect(controller.text()).toEqual("0D 00:00:00"); expect(controller.text()).toEqual("0D 00:00:00");
}); });
it("shows cssclass & name for the applicable start/restart action", function () { it("shows cssClass & name for the applicable start/restart action", function () {
invokeWatch('domainObject', mockDomainObject); invokeWatch('domainObject', mockDomainObject);
expect(controller.buttonCssClass()).toEqual("icon-play"); expect(controller.buttonCssClass()).toEqual("icon-play");
expect(controller.buttonText()).toEqual("Start"); expect(controller.buttonText()).toEqual("Start");

4
platform/features/conductor/core/res/templates/mode-selector/mode-menu.html
View File

@ -26,7 +26,7 @@
ng-click="ngModel.selectedKey=key"> ng-click="ngModel.selectedKey=key">
<a ng-mouseover="ngModel.activeMetadata = metadata" <a ng-mouseover="ngModel.activeMetadata = metadata"
ng-mouseleave="ngModel.activeMetadata = undefined" ng-mouseleave="ngModel.activeMetadata = undefined"
class="menu-item-a {{metadata.cssclass}}"> class="menu-item-a {{metadata.cssClass}}">
{{metadata.name}} {{metadata.name}}
</a> </a>
</li> </li>
@ -34,7 +34,7 @@
</div> </div>
<div class="pane right menu-item-description"> <div class="pane right menu-item-description">
<div <div
class="desc-area ui-symbol icon type-icon {{ngModel.activeMetadata.cssclass}}"></div> class="desc-area ui-symbol icon type-icon {{ngModel.activeMetadata.cssClass}}"></div>
<div class="desc-area title"> <div class="desc-area title">
{{ngModel.activeMetadata.name}} {{ngModel.activeMetadata.name}}
</div> </div>

2
platform/features/conductor/core/src/timeSystems/LocalClock.js
View File

@ -31,7 +31,7 @@ define(['./TickSource'], function (TickSource) {
this.metadata = { this.metadata = {
key: 'local', key: 'local',
mode: 'realtime', mode: 'realtime',
cssclass: 'icon-clock', cssClass: 'icon-clock',
label: 'Real-time', label: 'Real-time',
name: 'Real-time Mode', name: 'Real-time Mode',
description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will automatically advance themselves based on a UTC clock.' description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will automatically advance themselves based on a UTC clock.'

6
platform/features/conductor/core/src/ui/TimeConductorViewService.js
View File

@ -60,7 +60,7 @@ define(
this.availModes = { this.availModes = {
'fixed': { 'fixed': {
key: 'fixed', key: 'fixed',
cssclass: 'icon-calendar', cssClass: 'icon-calendar',
label: 'Fixed', label: 'Fixed',
name: 'Fixed Timespan Mode', name: 'Fixed Timespan Mode',
description: 'Query and explore data that falls between two fixed datetimes.' description: 'Query and explore data that falls between two fixed datetimes.'
@ -81,7 +81,7 @@ define(
if (timeSystemsForMode('realtime').length > 0) { if (timeSystemsForMode('realtime').length > 0) {
var realtimeMode = { var realtimeMode = {
key: 'realtime', key: 'realtime',
cssclass: 'icon-clock', cssClass: 'icon-clock',
label: 'Real-time', label: 'Real-time',
name: 'Real-time Mode', name: 'Real-time Mode',
description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will automatically advance themselves based on a UTC clock.' description: 'Monitor real-time streaming data as it comes in. The Time Conductor and displays will automatically advance themselves based on a UTC clock.'
@ -93,7 +93,7 @@ define(
if (timeSystemsForMode('lad').length > 0) { if (timeSystemsForMode('lad').length > 0) {
var ladMode = { var ladMode = {
key: 'lad', key: 'lad',
cssclass: 'icon-database', cssClass: 'icon-database',
label: 'LAD', label: 'LAD',
name: 'LAD Mode', name: 'LAD Mode',
description: 'Latest Available Data mode monitors real-time streaming data as it comes in. The Time Conductor and displays will only advance when data becomes available.' description: 'Latest Available Data mode monitors real-time streaming data as it comes in. The Time Conductor and displays will only advance when data becomes available.'

4
platform/features/conductor/utcTimeSystem/src/UTCTimeSystem.js
View File

@ -38,12 +38,12 @@ define([
/** /**
* Some metadata, which will be used to identify the time system in * Some metadata, which will be used to identify the time system in
* the UI * the UI
* @type {{key: string, name: string, cssclass: string}} * @type {{key: string, name: string, cssClass: string}}
*/ */
this.metadata = { this.metadata = {
'key': 'utc', 'key': 'utc',
'name': 'UTC', 'name': 'UTC',
'cssclass': 'icon-clock' 'cssClass': 'icon-clock'
}; };
this.fmts = ['utc']; this.fmts = ['utc'];

46
platform/features/fixed/bundle.js
View File

@ -36,7 +36,7 @@ define([
{ {
"key": "fixed-display", "key": "fixed-display",
"name": "Fixed Position Display", "name": "Fixed Position Display",
"cssclass": "icon-box-with-dashed-lines", "cssClass": "icon-box-with-dashed-lines",
"type": "telemetry.fixed", "type": "telemetry.fixed",
"template": fixedTemplate, "template": fixedTemplate,
"uses": [ "uses": [
@ -49,28 +49,28 @@ define([
"items": [ "items": [
{ {
"method": "add", "method": "add",
"cssclass": "icon-plus", "cssClass": "icon-plus",
"control": "menu-button", "control": "menu-button",
"text": "Add", "text": "Add",
"options": [ "options": [
{ {
"name": "Box", "name": "Box",
"cssclass": "icon-box", "cssClass": "icon-box",
"key": "fixed.box" "key": "fixed.box"
}, },
{ {
"name": "Line", "name": "Line",
"cssclass": "icon-line-horz", "cssClass": "icon-line-horz",
"key": "fixed.line" "key": "fixed.line"
}, },
{ {
"name": "Text", "name": "Text",
"cssclass": "icon-T", "cssClass": "icon-T",
"key": "fixed.text" "key": "fixed.text"
}, },
{ {
"name": "Image", "name": "Image",
"cssclass": "icon-image", "cssClass": "icon-image",
"key": "fixed.image" "key": "fixed.image"
} }
] ]
@ -81,50 +81,50 @@ define([
"items": [ "items": [
{ {
"method": "order", "method": "order",
"cssclass": "icon-layers", "cssClass": "icon-layers",
"control": "menu-button", "control": "menu-button",
"title": "Layering", "title": "Layering",
"description": "Move the selected object above or below other objects", "description": "Move the selected object above or below other objects",
"options": [ "options": [
{ {
"name": "Move to Top", "name": "Move to Top",
"cssclass": "icon-arrow-double-up", "cssClass": "icon-arrow-double-up",
"key": "top" "key": "top"
}, },
{ {
"name": "Move Up", "name": "Move Up",
"cssclass": "icon-arrow-up", "cssClass": "icon-arrow-up",
"key": "up" "key": "up"
}, },
{ {
"name": "Move Down", "name": "Move Down",
"cssclass": "icon-arrow-down", "cssClass": "icon-arrow-down",
"key": "down" "key": "down"
}, },
{ {
"name": "Move to Bottom", "name": "Move to Bottom",
"cssclass": "icon-arrow-double-down", "cssClass": "icon-arrow-double-down",
"key": "bottom" "key": "bottom"
} }
] ]
}, },
{ {
"property": "fill", "property": "fill",
"cssclass": "icon-paint-bucket", "cssClass": "icon-paint-bucket",
"title": "Fill color", "title": "Fill color",
"description": "Set fill color", "description": "Set fill color",
"control": "color" "control": "color"
}, },
{ {
"property": "stroke", "property": "stroke",
"cssclass": "icon-line-horz", "cssClass": "icon-line-horz",
"title": "Border color", "title": "Border color",
"description": "Set border color", "description": "Set border color",
"control": "color" "control": "color"
}, },
{ {
"property": "color", "property": "color",
"cssclass": "icon-T", "cssClass": "icon-T",
"title": "Text color", "title": "Text color",
"description": "Set text color", "description": "Set text color",
"mandatory": true, "mandatory": true,
@ -132,20 +132,20 @@ define([
}, },
{ {
"property": "url", "property": "url",
"cssclass": "icon-image", "cssClass": "icon-image",
"control": "dialog-button", "control": "dialog-button",
"title": "Image Properties", "title": "Image Properties",
"description": "Edit image properties", "description": "Edit image properties",
"dialog": { "dialog": {
"control": "textfield", "control": "textfield",
"name": "Image URL", "name": "Image URL",
"cssclass": "l-input-lg", "cssClass": "l-input-lg",
"required": true "required": true
} }
}, },
{ {
"property": "text", "property": "text",
"cssclass": "icon-gear", "cssClass": "icon-gear",
"control": "dialog-button", "control": "dialog-button",
"title": "Text Properties", "title": "Text Properties",
"description": "Edit text properties", "description": "Edit text properties",
@ -157,14 +157,14 @@ define([
}, },
{ {
"method": "showTitle", "method": "showTitle",
"cssclass": "icon-two-parts-both", "cssClass": "icon-two-parts-both",
"control": "button", "control": "button",
"title": "Show title", "title": "Show title",
"description": "Show telemetry element title" "description": "Show telemetry element title"
}, },
{ {
"method": "hideTitle", "method": "hideTitle",
"cssclass": "icon-two-parts-one-only", "cssClass": "icon-two-parts-one-only",
"control": "button", "control": "button",
"title": "Hide title", "title": "Hide title",
"description": "Hide telemetry element title" "description": "Hide telemetry element title"
@ -176,7 +176,7 @@ define([
{ {
"method": "remove", "method": "remove",
"control": "button", "control": "button",
"cssclass": "icon-trash" "cssClass": "icon-trash"
} }
] ]
} }
@ -188,7 +188,7 @@ define([
{ {
"key": "telemetry.fixed", "key": "telemetry.fixed",
"name": "Fixed Position Display", "name": "Fixed Position Display",
"cssclass": "icon-box-with-dashed-lines", "cssClass": "icon-box-with-dashed-lines",
"description": "Collect and display telemetry elements in " + "description": "Collect and display telemetry elements in " +
"alphanumeric format in a simple canvas workspace. " + "alphanumeric format in a simple canvas workspace. " +
"Elements can be positioned and sized. " + "Elements can be positioned and sized. " +
@ -215,12 +215,12 @@ define([
{ {
"name": "Horizontal grid (px)", "name": "Horizontal grid (px)",
"control": "textfield", "control": "textfield",
"cssclass": "l-input-sm l-numeric" "cssClass": "l-input-sm l-numeric"
}, },
{ {
"name": "Vertical grid (px)", "name": "Vertical grid (px)",
"control": "textfield", "control": "textfield",
"cssclass": "l-input-sm l-numeric" "cssClass": "l-input-sm l-numeric"
} }
], ],
"pattern": "^(\\d*[1-9]\\d*)?$", "pattern": "^(\\d*[1-9]\\d*)?$",

2
platform/features/imagery/bundle.js
View File

@ -41,7 +41,7 @@ define([
{ {
"name": "Imagery", "name": "Imagery",
"key": "imagery", "key": "imagery",
"cssclass": "icon-image", "cssClass": "icon-image",
"template": imageryTemplate, "template": imageryTemplate,
"priority": "preferred", "priority": "preferred",
"needs": [ "needs": [

54
platform/features/layout/bundle.js
View File

@ -56,7 +56,7 @@ define([
{ {
"key": "layout", "key": "layout",
"name": "Display Layout", "name": "Display Layout",
"cssclass": "icon-layout", "cssClass": "icon-layout",
"type": "layout", "type": "layout",
"template": layoutTemplate, "template": layoutTemplate,
"editable": true, "editable": true,
@ -65,7 +65,7 @@ define([
{ {
"key": "fixed", "key": "fixed",
"name": "Fixed Position", "name": "Fixed Position",
"cssclass": "icon-box-with-dashed-lines", "cssClass": "icon-box-with-dashed-lines",
"type": "telemetry.panel", "type": "telemetry.panel",
"template": fixedTemplate, "template": fixedTemplate,
"uses": [ "uses": [
@ -77,7 +77,7 @@ define([
"items": [ "items": [
{ {
"method": "add", "method": "add",
"cssclass": "icon-plus", "cssClass": "icon-plus",
"control": "menu-button", "control": "menu-button",
"text": "Add", "text": "Add",
"title": "Add", "title": "Add",
@ -85,22 +85,22 @@ define([
"options": [ "options": [
{ {
"name": "Box", "name": "Box",
"cssclass": "icon-box", "cssClass": "icon-box",
"key": "fixed.box" "key": "fixed.box"
}, },
{ {
"name": "Line", "name": "Line",
"cssclass": "icon-line-horz", "cssClass": "icon-line-horz",
"key": "fixed.line" "key": "fixed.line"
}, },
{ {
"name": "Text", "name": "Text",
"cssclass": "icon-T", "cssClass": "icon-T",
"key": "fixed.text" "key": "fixed.text"
}, },
{ {
"name": "Image", "name": "Image",
"cssclass": "icon-image", "cssClass": "icon-image",
"key": "fixed.image" "key": "fixed.image"
} }
] ]
@ -111,50 +111,50 @@ define([
"items": [ "items": [
{ {
"method": "order", "method": "order",
"cssclass": "icon-layers", "cssClass": "icon-layers",
"control": "menu-button", "control": "menu-button",
"title": "Layering", "title": "Layering",
"description": "Move the selected object above or below other objects", "description": "Move the selected object above or below other objects",
"options": [ "options": [
{ {
"name": "Move to Top", "name": "Move to Top",
"cssclass": "icon-arrow-double-up", "cssClass": "icon-arrow-double-up",
"key": "top" "key": "top"
}, },
{ {
"name": "Move Up", "name": "Move Up",
"cssclass": "icon-arrow-up", "cssClass": "icon-arrow-up",
"key": "up" "key": "up"
}, },
{ {
"name": "Move Down", "name": "Move Down",
"cssclass": "icon-arrow-down", "cssClass": "icon-arrow-down",
"key": "down" "key": "down"
}, },
{ {
"name": "Move to Bottom", "name": "Move to Bottom",
"cssclass": "icon-arrow-double-down", "cssClass": "icon-arrow-double-down",
"key": "bottom" "key": "bottom"
} }
] ]
}, },
{ {
"property": "fill", "property": "fill",
"cssclass": "icon-paint-bucket", "cssClass": "icon-paint-bucket",
"title": "Fill color", "title": "Fill color",
"description": "Set fill color", "description": "Set fill color",
"control": "color" "control": "color"
}, },
{ {
"property": "stroke", "property": "stroke",
"cssclass": "icon-line-horz", "cssClass": "icon-line-horz",
"title": "Border color", "title": "Border color",
"description": "Set border color", "description": "Set border color",
"control": "color" "control": "color"
}, },
{ {
"property": "color", "property": "color",
"cssclass": "icon-T", "cssClass": "icon-T",
"title": "Text color", "title": "Text color",
"description": "Set text color", "description": "Set text color",
"mandatory": true, "mandatory": true,
@ -162,20 +162,20 @@ define([
}, },
{ {
"property": "url", "property": "url",
"cssclass": "icon-image", "cssClass": "icon-image",
"control": "dialog-button", "control": "dialog-button",
"title": "Image Properties", "title": "Image Properties",
"description": "Edit image properties", "description": "Edit image properties",
"dialog": { "dialog": {
"control": "textfield", "control": "textfield",
"name": "Image URL", "name": "Image URL",
"cssclass": "l-input-lg", "cssClass": "l-input-lg",
"required": true "required": true
} }
}, },
{ {
"property": "text", "property": "text",
"cssclass": "icon-gear", "cssClass": "icon-gear",
"control": "dialog-button", "control": "dialog-button",
"title": "Text Properties", "title": "Text Properties",
"description": "Edit text properties", "description": "Edit text properties",
@ -187,14 +187,14 @@ define([
}, },
{ {
"method": "showTitle", "method": "showTitle",
"cssclass": "icon-two-parts-both", "cssClass": "icon-two-parts-both",
"control": "button", "control": "button",
"title": "Show title", "title": "Show title",
"description": "Show telemetry element title" "description": "Show telemetry element title"
}, },
{ {
"method": "hideTitle", "method": "hideTitle",
"cssclass": "icon-two-parts-one-only", "cssClass": "icon-two-parts-one-only",
"control": "button", "control": "button",
"title": "Hide title", "title": "Hide title",
"description": "Hide telemetry element title" "description": "Hide telemetry element title"
@ -206,7 +206,7 @@ define([
{ {
"method": "remove", "method": "remove",
"control": "button", "control": "button",
"cssclass": "icon-trash", "cssClass": "icon-trash",
"title": "Delete", "title": "Delete",
"description": "Delete the selected item" "description": "Delete the selected item"
} }
@ -275,7 +275,7 @@ define([
{ {
"key": "layout", "key": "layout",
"name": "Display Layout", "name": "Display Layout",
"cssclass": "icon-layout", "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.", "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, "priority": 900,
"features": "creation", "features": "creation",
@ -291,12 +291,12 @@ define([
{ {
"name": "Horizontal grid (px)", "name": "Horizontal grid (px)",
"control": "textfield", "control": "textfield",
"cssclass": "l-input-sm l-numeric" "cssClass": "l-input-sm l-numeric"
}, },
{ {
"name": "Vertical grid (px)", "name": "Vertical grid (px)",
"control": "textfield", "control": "textfield",
"cssclass": "l-input-sm l-numeric" "cssClass": "l-input-sm l-numeric"
} }
], ],
"key": "layoutGrid", "key": "layoutGrid",
@ -307,7 +307,7 @@ define([
{ {
"key": "telemetry.panel", "key": "telemetry.panel",
"name": "Telemetry Panel", "name": "Telemetry Panel",
"cssclass": "icon-telemetry-panel", "cssClass": "icon-telemetry-panel",
"description": "A panel for collecting telemetry elements.", "description": "A panel for collecting telemetry elements.",
"priority": 899, "priority": 899,
"delegates": [ "delegates": [
@ -330,12 +330,12 @@ define([
{ {
"name": "Horizontal grid (px)", "name": "Horizontal grid (px)",
"control": "textfield", "control": "textfield",
"cssclass": "l-input-sm l-numeric" "cssClass": "l-input-sm l-numeric"
}, },
{ {
"name": "Vertical grid (px)", "name": "Vertical grid (px)",
"control": "textfield", "control": "textfield",
"cssclass": "l-input-sm l-numeric" "cssClass": "l-input-sm l-numeric"
} }
], ],
"pattern": "^(\\d*[1-9]\\d*)?$", "pattern": "^(\\d*[1-9]\\d*)?$",

2
platform/features/layout/src/elements/ElementFactory.js
View File

@ -55,7 +55,7 @@ define(
key: "url", key: "url",
control: "textfield", control: "textfield",
name: "Image URL", name: "Image URL",
"cssclass": "l-input-lg", "cssClass": "l-input-lg",
required: true required: true
} }
] ]

4
platform/features/pages/bundle.js
View File

@ -36,7 +36,7 @@ define([
{ {
"key": "example.page", "key": "example.page",
"name": "Web Page", "name": "Web Page",
"cssclass": "icon-page", "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.", "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, "priority": 50,
"features": [ "features": [
@ -49,7 +49,7 @@ define([
"control": "textfield", "control": "textfield",
"pattern": "^(ftp|https?)\\:\\/\\/\\w+(\\.\\w+)*(\\:\\d+)?(\\/\\S*)*$", "pattern": "^(ftp|https?)\\:\\/\\/\\w+(\\.\\w+)*(\\:\\d+)?(\\/\\S*)*$",
"required": true, "required": true,
"cssclass": "l-input-lg" "cssClass": "l-input-lg"
} }
] ]
} }

2
platform/features/plot/bundle.js
View File

@ -47,7 +47,7 @@ define([
{ {
"name": "Plot", "name": "Plot",
"key": "plot", "key": "plot",
"cssclass": "icon-sine", "cssClass": "icon-sine",
"template": plotTemplate, "template": plotTemplate,
"needs": [ "needs": [
"telemetry" "telemetry"

4
platform/features/plot/res/templates/plot.html
View File

@ -121,7 +121,7 @@
ng-show="plot.isZoomed()" ng-show="plot.isZoomed()"
title="Reset pan/zoom"> title="Reset pan/zoom">
</a> </a>
<div class="menu-element s-menu-button menus-to-left {{plot.getMode().cssclass}}" <div class="menu-element s-menu-button menus-to-left {{plot.getMode().cssClass}}"
ng-if="plot.getModeOptions().length > 1" ng-if="plot.getModeOptions().length > 1"
ng-controller="ClickAwayController as toggle"> ng-controller="ClickAwayController as toggle">
<span class="l-click-area" ng-click="toggle.toggle()"></span> <span class="l-click-area" ng-click="toggle.toggle()"></span>
@ -130,7 +130,7 @@
<ul> <ul>
<li ng-repeat="option in plot.getModeOptions()" <li ng-repeat="option in plot.getModeOptions()"
ng-click="plot.setMode(option); toggle.setState(false)" ng-click="plot.setMode(option); toggle.setState(false)"
class="{{option.cssclass}}"> class="{{option.cssClass}}">
{{option.name}} {{option.name}}
</li> </li>
</ul> </ul>

2
platform/features/plot/src/PlotController.js
View File

@ -352,7 +352,7 @@ define(
/** /**
* Get the current mode that is applicable to this plot. This * Get the current mode that is applicable to this plot. This
* will include key, name, and cssclass fields. * will include key, name, and cssClass fields.
*/ */
PlotController.prototype.getMode = function () { PlotController.prototype.getMode = function () {
return this.modeOptions.getMode(); return this.modeOptions.getMode();

6
platform/features/plot/src/modes/PlotModeOptions.js
View File

@ -27,13 +27,13 @@ define(
var STACKED = { var STACKED = {
key: "stacked", key: "stacked",
name: "Stacked", name: "Stacked",
cssclass: "icon-plot-stacked", cssClass: "icon-plot-stacked",
Constructor: PlotStackMode Constructor: PlotStackMode
}, },
OVERLAID = { OVERLAID = {
key: "overlaid", key: "overlaid",
name: "Overlaid", name: "Overlaid",
cssclass: "icon-plot-overlay", cssClass: "icon-plot-overlay",
Constructor: PlotOverlayMode Constructor: PlotOverlayMode
}; };
@ -115,7 +115,7 @@ define(
/** /**
* Get all mode options available for each plot. Each * Get all mode options available for each plot. Each
* mode contains a `name` and `cssclass` field suitable * mode contains a `name` and `cssClass` field suitable
* for display in a template. * for display in a template.
* @return {Array} the available modes * @return {Array} the available modes
*/ */

2
platform/features/static-markup/bundle.js
View File

@ -36,7 +36,7 @@ define([
{ {
"key": "static.markup", "key": "static.markup",
"name": "Static Markup", "name": "Static Markup",
"cssclass": "icon-pencil", "cssClass": "icon-pencil",
"description": "Static markup sandbox", "description": "Static markup sandbox",
"features": [ "features": [
"creation" "creation"

8
platform/features/table/bundle.js
View File

@ -66,7 +66,7 @@ define([
{ {
"key": "table", "key": "table",
"name": "Historical Telemetry Table", "name": "Historical Telemetry Table",
"cssclass": "icon-tabular", "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.", "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, "priority": 861,
"features": "creation", "features": "creation",
@ -89,7 +89,7 @@ define([
{ {
"key": "rttable", "key": "rttable",
"name": "Real-time Telemetry Table", "name": "Real-time Telemetry Table",
"cssclass": "icon-tabular-realtime", "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.", "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, "priority": 860,
"features": "creation", "features": "creation",
@ -134,7 +134,7 @@ define([
"name": "Historical Table", "name": "Historical Table",
"key": "table", "key": "table",
"template": historicalTableTemplate, "template": historicalTableTemplate,
"cssclass": "icon-tabular", "cssClass": "icon-tabular",
"needs": [ "needs": [
"telemetry" "telemetry"
], ],
@ -144,7 +144,7 @@ define([
{ {
"name": "Real-time Table", "name": "Real-time Table",
"key": "rt-table", "key": "rt-table",
"cssclass": "icon-tabular-realtime", "cssClass": "icon-tabular-realtime",
"template": rtTableTemplate, "template": rtTableTemplate,
"needs": [ "needs": [
"telemetry" "telemetry"

26
platform/features/timeline/bundle.js
View File

@ -153,7 +153,7 @@ define([
{ {
"key": "timeline", "key": "timeline",
"name": "Timeline", "name": "Timeline",
"cssclass": "icon-timeline", "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.", "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, "priority": 502,
"features": [ "features": [
@ -206,7 +206,7 @@ define([
{ {
"key": "activity", "key": "activity",
"name": "Activity", "name": "Activity",
"cssclass": "icon-activity", "cssClass": "icon-activity",
"features": [ "features": [
"creation" "creation"
], ],
@ -252,7 +252,7 @@ define([
{ {
"key": "mode", "key": "mode",
"name": "Activity Mode", "name": "Activity Mode",
"cssclass": "icon-activity-mode", "cssClass": "icon-activity-mode",
"features": [ "features": [
"creation" "creation"
], ],
@ -292,7 +292,7 @@ define([
{ {
"key": "values", "key": "values",
"name": "Values", "name": "Values",
"cssclass": "icon-activity-mode", "cssClass": "icon-activity-mode",
"template": valuesTemplate, "template": valuesTemplate,
"type": "mode", "type": "mode",
"uses": [ "uses": [
@ -303,7 +303,7 @@ define([
{ {
"key": "timeline", "key": "timeline",
"name": "Timeline", "name": "Timeline",
"cssclass": "icon-timeline", "cssClass": "icon-timeline",
"type": "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.", "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, "template": timelineTemplate,
@ -319,12 +319,12 @@ define([
"options": [ "options": [
{ {
"name": "Timeline", "name": "Timeline",
"cssclass": "icon-timeline", "cssClass": "icon-timeline",
"key": "timeline" "key": "timeline"
}, },
{ {
"name": "Activity", "name": "Activity",
"cssclass": "icon-activity", "cssClass": "icon-activity",
"key": "activity" "key": "activity"
} }
] ]
@ -334,13 +334,13 @@ define([
{ {
"items": [ "items": [
{ {
"cssclass": "icon-plot-resource", "cssClass": "icon-plot-resource",
"description": "Graph Resource Utilization", "description": "Graph Resource Utilization",
"control": "button", "control": "button",
"method": "toggleGraph" "method": "toggleGraph"
}, },
{ {
"cssclass": "icon-activity-mode", "cssClass": "icon-activity-mode",
"control": "dialog-button", "control": "dialog-button",
"description": "Apply Activity Modes...", "description": "Apply Activity Modes...",
"title": "Apply Activity Modes", "title": "Apply Activity Modes",
@ -353,7 +353,7 @@ define([
"property": "modes" "property": "modes"
}, },
{ {
"cssclass": "icon-chain-links", "cssClass": "icon-chain-links",
"description": "Edit Activity Link", "description": "Edit Activity Link",
"title": "Activity Link", "title": "Activity Link",
"control": "dialog-button", "control": "dialog-button",
@ -361,12 +361,12 @@ define([
"control": "textfield", "control": "textfield",
"name": "Link", "name": "Link",
"pattern": "^(ftp|https?)\\:\\/\\/\\w+(\\.\\w+)*(\\:\\d+)?(\\/\\S*)*$", "pattern": "^(ftp|https?)\\:\\/\\/\\w+(\\.\\w+)*(\\:\\d+)?(\\/\\S*)*$",
"cssclass": "l-input-lg" "cssClass": "l-input-lg"
}, },
"property": "link" "property": "link"
}, },
{ {
"cssclass": "icon-gear", "cssClass": "icon-gear",
"description": "Edit Properties...", "description": "Edit Properties...",
"control": "button", "control": "button",
"method": "properties" "method": "properties"
@ -379,7 +379,7 @@ define([
"method": "remove", "method": "remove",
"description": "Remove Item", "description": "Remove Item",
"control": "button", "control": "button",
"cssclass": "icon-trash" "cssClass": "icon-trash"
} }
] ]
} }

2
platform/forms/res/templates/controls/button.html
View File

@ -19,7 +19,7 @@
this source code distribution or the Licensing information page available this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information. at runtime from the About dialog for additional information.
--> -->
<a class="s-button {{structure.cssclass}}" <a class="s-button {{structure.cssClass}}"
ng-class="{ labeled: structure.text }" ng-class="{ labeled: structure.text }"
ng-click="structure.click()"> ng-click="structure.click()">
<span class="title-label" ng-if="structure.text"> <span class="title-label" ng-if="structure.text">

2
platform/forms/res/templates/controls/color.html
View File

@ -19,7 +19,7 @@
this source code distribution or the Licensing information page available this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information. at runtime from the About dialog for additional information.
--> -->
<div class="s-button s-menu-button menu-element t-color-palette {{structure.cssclass}}" <div class="s-button s-menu-button menu-element t-color-palette {{structure.cssClass}}"
ng-controller="ClickAwayController as toggle"> ng-controller="ClickAwayController as toggle">
<span class="l-click-area" ng-click="toggle.toggle()"></span> <span class="l-click-area" ng-click="toggle.toggle()"></span>

2
platform/forms/res/templates/controls/composite.html
View File

@ -21,7 +21,7 @@
--> -->
<span ng-controller="CompositeController as compositeCtrl"> <span ng-controller="CompositeController as compositeCtrl">
<ng-form name="mctFormItem" ng-repeat="item in structure.items"> <ng-form name="mctFormItem" ng-repeat="item in structure.items">
<div class="l-composite-control l-{{item.control}} {{item.cssclass}}"> <div class="l-composite-control l-{{item.control}} {{item.cssClass}}">
<mct-control key="item.control" <mct-control key="item.control"
ng-model="ngModel[field]" ng-model="ngModel[field]"
ng-required="ngRequired || compositeCtrl.isNonEmpty(ngModel[field])" ng-required="ngRequired || compositeCtrl.isNonEmpty(ngModel[field])"

4
platform/forms/res/templates/controls/menu-button.html
View File

@ -19,7 +19,7 @@
this source code distribution or the Licensing information page available this source code distribution or the Licensing information page available
at runtime from the About dialog for additional information. at runtime from the About dialog for additional information.
--> -->
<div class="s-menu-button menu-element {{ structure.cssclass }}" <div class="s-menu-button menu-element {{ structure.cssClass }}"
ng-controller="ClickAwayController as toggle"> ng-controller="ClickAwayController as toggle">
<span class="l-click-area" ng-click="toggle.toggle()"></span> <span class="l-click-area" ng-click="toggle.toggle()"></span>
@ -31,7 +31,7 @@
<ul> <ul>
<li ng-click="structure.click(option.key); toggle.setState(false)" <li ng-click="structure.click(option.key); toggle.setState(false)"
ng-repeat="option in structure.options" ng-repeat="option in structure.options"
class="{{ option.cssclass }}"> class="{{ option.cssClass }}">
{{option.name}} {{option.name}}
</li> </li>
</ul> </ul>

2
platform/forms/res/templates/controls/textarea.html
View File

@ -20,7 +20,7 @@
at runtime from the About dialog for additional information. at runtime from the About dialog for additional information.
--> -->
<span class='form-control shell'> <span class='form-control shell'>
<span class='field control {{structure.cssclass}}'> <span class='field control {{structure.cssClass}}'>
<textarea ng-required="ngRequired" <textarea ng-required="ngRequired"
ng-model="ngModel[field]" ng-model="ngModel[field]"
ng-pattern="ngPattern" ng-pattern="ngPattern"

2
platform/forms/res/templates/controls/textfield.html
View File

@ -20,7 +20,7 @@
at runtime from the About dialog for additional information. at runtime from the About dialog for additional information.
--> -->
<span class='form-control shell'> <span class='form-control shell'>
<span class='field control {{structure.cssclass}}'> <span class='field control {{structure.cssClass}}'>
<input type="text" <input type="text"
ng-required="ngRequired" ng-required="ngRequired"
ng-model="ngModel[field]" ng-model="ngModel[field]"

4
platform/forms/res/templates/form.html
View File

@ -21,11 +21,11 @@
--> -->
<form name="mctForm" novalidate class="form l-flex-col"> <form name="mctForm" novalidate class="form l-flex-col">
<span ng-repeat="section in structure.sections" <span ng-repeat="section in structure.sections"
class="l-form-section l-flex-col flex-elem {{ section.cssclass }}"> class="l-form-section l-flex-col flex-elem {{ section.cssClass }}">
<div class="section-header flex-elem" ng-if="section.name"> <div class="section-header flex-elem" ng-if="section.name">
{{section.name}} {{section.name}}
</div> </div>
<ng-form class="form-row validates l-flex-row flex-elem {{ section.cssclass }}" <ng-form class="form-row validates l-flex-row flex-elem {{ section.cssClass }}"
ng-class="{ ng-class="{
first:$index < 1, first:$index < 1,
req: row.required, req: row.required,

2
platform/forms/src/controllers/DialogButtonController.js
View File

@ -63,7 +63,7 @@ define(
// Prepare the structure for the button itself // Prepare the structure for the button itself
self.buttonStructure = {}; self.buttonStructure = {};
self.buttonStructure.cssclass = structure.cssclass; self.buttonStructure.cssClass = structure.cssClass;
self.buttonStructure.name = structure.name; self.buttonStructure.name = structure.name;
self.buttonStructure.description = structure.description; self.buttonStructure.description = structure.description;
self.buttonStructure.click = showDialog; self.buttonStructure.click = showDialog;

4
platform/forms/test/controllers/DialogButtonControllerSpec.js
View File

@ -46,7 +46,7 @@ define(
); );
testStructure = { testStructure = {
name: "A Test", name: "A Test",
cssclass: "icon-T", cssClass: "icon-T",
description: "Test description", description: "Test description",
control: "dialog-button", control: "dialog-button",
title: "Test title", title: "Test title",
@ -83,7 +83,7 @@ define(
mockScope.$watch.mostRecentCall.args[1](testStructure); mockScope.$watch.mostRecentCall.args[1](testStructure);
buttonStructure = controller.getButtonStructure(); buttonStructure = controller.getButtonStructure();
expect(buttonStructure.cssclass).toEqual(testStructure.cssclass); expect(buttonStructure.cssClass).toEqual(testStructure.cssClass);
expect(buttonStructure.description).toEqual(testStructure.description); expect(buttonStructure.description).toEqual(testStructure.description);
expect(buttonStructure.name).toEqual(testStructure.name); expect(buttonStructure.name).toEqual(testStructure.name);
expect(buttonStructure.click).toEqual(jasmine.any(Function)); expect(buttonStructure.click).toEqual(jasmine.any(Function));

2
platform/search/res/templates/search-menu.html
View File

@ -40,7 +40,7 @@
</li> </li>
<!-- The filter options, by type --> <!-- The filter options, by type -->
<li class="search-menu-item {{ type.cssclass }}" <li class="search-menu-item {{ type.cssClass }}"
ng-repeat="type in ngModel.types" ng-repeat="type in ngModel.types"
ng-click="ngModel.checked[type.key] = !ngModel.checked[type.key]; controller.updateOptions()"> ng-click="ngModel.checked[type.key] = !ngModel.checked[type.key]; controller.updateOptions()">

2
platform/search/test/controllers/SearchControllerSpec.js
View File

@ -69,7 +69,7 @@ define([
); );
mockSearchService.query.andReturn(mockPromise); mockSearchService.query.andReturn(mockPromise);
mockTypes = [{key: 'mock.type', name: 'Mock Type', cssclass: 'icon-object-unknown'}]; mockTypes = [{key: 'mock.type', name: 'Mock Type', cssClass: 'icon-object-unknown'}];
mockSearchResult = jasmine.createSpyObj( mockSearchResult = jasmine.createSpyObj(
'searchResult', 'searchResult',

4
platform/search/test/controllers/SearchMenuControllerSpec.js
View File

@ -39,8 +39,8 @@ define(
); );
mockTypes = [ mockTypes = [
{key: 'mock.type.1', name: 'Mock Type 1', cssclass: 'icon-layout'}, {key: 'mock.type.1', name: 'Mock Type 1', cssClass: 'icon-layout'},
{key: 'mock.type.2', name: 'Mock Type 2', cssclass: 'icon-telemetry'} {key: 'mock.type.2', name: 'Mock Type 2', cssClass: 'icon-telemetry'}
]; ];
mockScope.ngModel = {}; mockScope.ngModel = {};

2
src/api/telemetry/TelemetryAPI.js
View File

@ -53,7 +53,7 @@ define([
* A violation of limits defined for a telemetry property. * A violation of limits defined for a telemetry property.
* @typedef LimitViolation * @typedef LimitViolation
* @memberof {module:openmct.TelemetryAPI~} * @memberof {module:openmct.TelemetryAPI~}
* @property {string} cssclass the class (or space-separated classes) to * @property {string} cssClass the class (or space-separated classes) to
* apply to display elements for values which violate this limit * apply to display elements for values which violate this limit
* @property {string} name the human-readable name for the limit violation * @property {string} name the human-readable name for the limit violation
*/ */

2
src/api/types/Type.js
View File

@ -54,7 +54,7 @@ define(function () {
Type.prototype.toLegacyDefinition = function () { Type.prototype.toLegacyDefinition = function () {
var def = {}; var def = {};
def.name = this.definition.label; def.name = this.definition.label;
def.cssclass = this.definition.cssclass; def.cssClass = this.definition.cssClass;
def.description = this.definition.description; def.description = this.definition.description;
def.properties = this.definition.form; def.properties = this.definition.form;

2
src/api/types/TypeRegistry.js
View File

@ -30,7 +30,7 @@ define(['./Type'], function (Type) {
* the model for new domain objects of this type * the model for new domain objects of this type
* @property {boolean} [creatable] true if users should be allowed to * @property {boolean} [creatable] true if users should be allowed to
* create this type (default: false) * create this type (default: false)
* @property {string} [cssclass] the CSS class to apply for icons * @property {string} [cssClass] the CSS class to apply for icons
*/ */
/** /**

2
src/ui/ViewRegistry.js
View File

@ -143,7 +143,7 @@ define([], function () {
* @property {string} key a machine-readable name for this view * @property {string} key a machine-readable name for this view
* @property {string} [description] a longer-form description (typically * @property {string} [description] a longer-form description (typically
* a single sentence or short paragraph) of this kind of view * a single sentence or short paragraph) of this kind of view
* @property {string} cssclass the CSS class to apply to labels for this * @property {string} cssClass the CSS class to apply to labels for this
* view (to add icons, for instance) * view (to add icons, for instance)
*/ */