Skip to content

Commit c699cb8

Browse files
committed
Merge remote-tracking branch 'origin/master' into open933-c
# Conflicts: # platform/commonUI/edit/res/templates/create/create-menu.html # platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot # platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg # platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf # platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff # platform/commonUI/general/res/sass/_archetypes.scss # platform/commonUI/general/res/sass/_constants.scss # platform/commonUI/general/res/sass/_icons.scss # platform/commonUI/general/res/sass/_main.scss # platform/commonUI/general/res/sass/_mixins.scss # platform/commonUI/general/res/sass/controls/_buttons.scss # platform/commonUI/general/res/templates/controls/time-controller.html # platform/commonUI/themes/snow/res/sass/_constants.scss
2 parents 579c6b6 + d1e1ba1 commit c699cb8

File tree

1,081 files changed

+8589
-7248
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

1,081 files changed

+8589
-7248
lines changed

LICENSES.md

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
# Open MCT Web Licenses
1+
# Open MCT Licenses
22

3-
Open MCT Web, Copyright (c) 2014-2015, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
3+
Open MCT, Copyright (c) 2014-2016, United States Government as represented by the Administrator of the National Aeronautics and Space Administration. All rights reserved.
44

5-
Open MCT Web is licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
5+
Open MCT is licensed under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at http://www.apache.org/licenses/LICENSE-2.0.
66

77
Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific language governing permissions and limitations under the License.
88

9-
Open MCT Web includes source code licensed under additional open source licenses as follows.
9+
Open MCT includes source code licensed under additional open source licenses as follows.
1010

1111
## Software Components Licenses
1212

README.md

+62-35
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,67 @@
11
# Open MCT [![license](https://img.shields.io/badge/license-Apache%202.0-blue.svg)](http://www.apache.org/licenses/LICENSE-2.0)
22

3-
Open MCT is a web-based platform for mission operations user interface
4-
software.
3+
Open MCT is a next-generation mission control framework for visualization of data on desktop and mobile devices. It is developed at NASA's Ames Research Center, and is being used by NASA for data analysis of spacecraft missions, as well as planning and operation of experimental rover systems. As a generalizable and open source framework, Open MCT could be used as the basis for building applications for planning, operation, and analysis of any systems producing telemetry data.
4+
5+
Please visit our [Official Site](https://nasa.github.io/openmct/) and [Getting Started Guide](https://nasa.github.io/openmct/getting-started/)
6+
7+
## See Open MCT in Action
8+
9+
Try Open MCT now with our [live demo](https://openmct-demo.herokuapp.com/).
10+
![Demo](https://nasa.github.io/openmct/static/res/images/Open-MCT.Browse.Layout.Mars-Weather-1.jpg)
11+
12+
## Building and Running Open MCT Locally
13+
14+
Building and running Open MCT in your local dev environment is very easy. Be sure you have [Git](https://git-scm.com/downloads) and [Node.js](https://nodejs.org/) installed, then follow the directions below. Need additional information? Check out the [Getting Started](https://nasa.github.io/openmct/getting-started/) page on our website.
15+
16+
1. Clone the source code
17+
18+
`git clone https://github.com/nasa/openmct.git`
19+
20+
2. Install development dependencies
21+
22+
`npm install`
23+
24+
3. Run a local development server
25+
26+
`npm start`
27+
28+
Open MCT is now running, and can be accessed by pointing a web browser at [http://localhost:8080/](http://localhost:8080/)
29+
30+
## Documentation
31+
32+
Documentation is available on the [Open MCT website](https://nasa.github.io/openmct/documentation/). The documentation can also be built locally.
33+
34+
### Building the Open MCT Documentation Locally
35+
Open MCT's documentation is generated by an
36+
[npm](https://www.npmjs.com/)-based build. It has additional dependencies that
37+
may not be available on every platform and thus is not covered in the standard
38+
npm install. Ensure your system has [libcairo](http://cairographics.org/)
39+
installed and then run the following commands:
40+
41+
* `npm install`
42+
* `npm install canvas nomnoml`
43+
* `npm run docs`
44+
45+
Documentation will be generated in `target/docs`.
46+
47+
## Deploying Open MCT
48+
49+
Open MCT is built using [`npm`](http://npmjs.com/)
50+
and [`gulp`](http://gulpjs.com/).
51+
52+
To build Open MCT for deployment:
53+
54+
`npm run prepublish`
55+
56+
This will compile and minify JavaScript sources, as well as copy over assets.
57+
The contents of the `dist` folder will contain a runnable Open MCT
58+
instance (e.g. by starting an HTTP server in that directory), including:
59+
60+
* A `main.js` file containing Open MCT source code.
61+
* Various assets in the `example` and `platform` directories.
62+
* An `index.html` that runs Open MCT in its default configuration.
63+
64+
Additional `gulp` tasks are defined in [the gulpfile](gulpfile.js).
565

666
## Bundles
767

@@ -54,39 +114,6 @@ To run:
54114
* `npm install`
55115
* `npm run all`
56116

57-
## Build
58-
59-
Open MCT is built using [`npm`](http://npmjs.com/)
60-
and [`gulp`](http://gulpjs.com/).
61-
62-
To build:
63-
64-
`npm run prepublish`
65-
66-
This will compile and minify JavaScript sources, as well as copy over assets.
67-
The contents of the `dist` folder will contain a runnable Open MCT
68-
instance (e.g. by starting an HTTP server in that directory), including:
69-
70-
* A `main.js` file containing Open MCT source code.
71-
* Various assets in the `example` and `platform` directories.
72-
* An `index.html` that runs Open MCT in its default configuration.
73-
74-
Additional `gulp` tasks are defined in [the gulpfile](gulpfile.js).
75-
76-
### Building Documentation
77-
78-
Open MCT's documentation is generated by an
79-
[npm](https://www.npmjs.com/)-based build. It has additional dependencies that
80-
may not be available on every platform and thus is not covered in the standard
81-
npm install. Ensure your system has [libcairo](http://cairographics.org/)
82-
installed and then run the following commands:
83-
84-
* `npm install`
85-
* `npm install canvas nomnoml`
86-
* `npm run docs`
87-
88-
Documentation will be generated in `target/docs`.
89-
90117
# Glossary
91118

92119
Certain terms are used throughout Open MCT with consistent meanings

app.js

+2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@
4242
process.exit(0);
4343
}
4444

45+
app.disable('x-powered-by');
46+
4547
// Override bundles.json for HTTP requests
4648
app.use('/' + BUNDLE_FILE, function (req, res) {
4749
var bundles;

build-docs.sh

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
11
#!/bin/bash
22

33
#*****************************************************************************
4-
#* Open MCT Web, Copyright (c) 2014-2015, United States Government
4+
#* Open MCT, Copyright (c) 2014-2016, United States Government
55
#* as represented by the Administrator of the National Aeronautics and Space
66
#* Administration. All rights reserved.
77
#*
8-
#* Open MCT Web is licensed under the Apache License, Version 2.0 (the
8+
#* Open MCT is licensed under the Apache License, Version 2.0 (the
99
#* "License"); you may not use this file except in compliance with the License.
1010
#* You may obtain a copy of the License at
1111
#* http://www.apache.org/licenses/LICENSE-2.0.
@@ -16,7 +16,7 @@
1616
#* License for the specific language governing permissions and limitations
1717
#* under the License.
1818
#*
19-
#* Open MCT Web includes source code licensed under additional open source
19+
#* Open MCT includes source code licensed under additional open source
2020
#* licenses. See the Open Source Licenses file (LICENSES.md) included with
2121
#* this source code distribution or the Licensing information page available
2222
#* at runtime from the About dialog for additional information.

docs/gendocs.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*****************************************************************************
2-
* Open MCT Web, Copyright (c) 2014-2015, United States Government
2+
* Open MCT, Copyright (c) 2014-2016, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*
6-
* Open MCT Web is licensed under the Apache License, Version 2.0 (the
6+
* Open MCT is licensed under the Apache License, Version 2.0 (the
77
* "License"); you may not use this file except in compliance with the License.
88
* You may obtain a copy of the License at
99
* http://www.apache.org/licenses/LICENSE-2.0.
@@ -14,7 +14,7 @@
1414
* License for the specific language governing permissions and limitations
1515
* under the License.
1616
*
17-
* Open MCT Web includes source code licensed under additional open source
17+
* Open MCT includes source code licensed under additional open source
1818
* licenses. See the Open Source Licenses file (LICENSES.md) included with
1919
* this source code distribution or the Licensing information page available
2020
* at runtime from the About dialog for additional information.

docs/src/design/planning/APIRefactor.md

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
# API Refactoring
22

33
This document summarizes a path toward implementing API changes
4-
from the [API Redesign](../proposals/APIRedesign.md) for Open MCT Web
4+
from the [API Redesign](../proposals/APIRedesign.md) for Open MCT
55
v1.0.0.
66

77
# Goals
@@ -161,7 +161,7 @@ be included in a straightforward fashion.
161161

162162
Some goals for this build step:
163163

164-
* Compile (and, preferably, optimize/minify) Open MCT Web
164+
* Compile (and, preferably, optimize/minify) Open MCT
165165
sources into a single `.js` file.
166166
* It is desirable to do the same for HTML sources, but
167167
may wish to defer this until a subsequent refactoring
@@ -170,7 +170,7 @@ Some goals for this build step:
170170
derivative projects in a straightforward fashion.
171171

172172
Should also consider which dependency/packaging manager should
173-
be used by dependent projects to obtain Open MCT Web. Approaches
173+
be used by dependent projects to obtain Open MCT. Approaches
174174
include:
175175

176176
1. Plain `npm`. Dependents then declare their dependency with
@@ -203,15 +203,15 @@ to use for asset generation/management and compilation/minification/etc.
203203

204204
## Step 3. Separate repositories
205205

206-
Refactor existing applications built on Open MCT Web such that they
206+
Refactor existing applications built on Open MCT such that they
207207
are no longer forks, but instead separate projects with a dependency
208208
on the built artifacts from Step 2.
209209

210210
Note that this is achievable already using `bower` (see `warp-bower`
211211
branch at http://developer.nasa.gov/mct/warp for an example.)
212212
However, changes involved in switching to an imperative API and
213213
introducing a build process may change (and should simplify) the
214-
approach used to utilize Open MCT Web as a dependency, so these
214+
approach used to utilize Open MCT as a dependency, so these
215215
changes should be introduced first.
216216

217217
## Step 4. Design registration API
@@ -287,7 +287,7 @@ or separately in parallel) and should involve a tight cycle of:
287287
planning should be done to spread out the changes incrementally.
288288

289289
By necessity, these changes may break functionality in applications
290-
built using Open MCT Web. On a case-by-case basis, should consider
290+
built using Open MCT. On a case-by-case basis, should consider
291291
providing temporary "legacy support" to allow downstream updates
292292
to occur as a separate task; the relevant trade here is between
293293
waste/effort required to maintain legacy support, versus the
@@ -299,11 +299,11 @@ across several repositories.
299299

300300
Update bundles to remove any usages of legacy support for bundles
301301
(including that used by dependent projects.) Then, remove legacy
302-
support from Open MCT Web.
302+
support from Open MCT.
303303

304304
## Step 8. Release candidacy
305305

306-
Once API changes are complete, Open MCT Web should enter a release
306+
Once API changes are complete, Open MCT should enter a release
307307
candidacy cycle. Important things to look at here:
308308

309309
* Are changes really complete?

docs/src/design/proposals/APIRedesign.md

+13-13
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
# Overview
22

3-
The purpose of this document is to review feedback on Open MCT Web's
3+
The purpose of this document is to review feedback on Open MCT's
44
current API and propose improvements to the API, particularly for a
55
1.0.0 release.
66

@@ -64,7 +64,7 @@ useful, powerful interfaces.
6464
## Developer Intern Feedback
6565

6666
This feedback comes from interns who worked closely with
67-
Open MCT Web as their primary task over the Summer of 2015.
67+
Open MCT as their primary task over the Summer of 2015.
6868

6969
### Developer Intern 1
7070

@@ -104,7 +104,7 @@ Worked on bug fixes in the platform and a plugin for search.
104104

105105
Worked on platform bug fixes and mobile support.
106106

107-
* No guide for the UI and front end for the HTML/CSS part of Open MCT Web.
107+
* No guide for the UI and front end for the HTML/CSS part of Open MCT.
108108
Not sure if this is applicable or needed for developers, however would
109109
be helpful to any front end development
110110
* Found it difficult to follow the plot controller & subplot
@@ -118,11 +118,11 @@ Worked on platform bug fixes and mobile support.
118118
## Plugin Developer Feedback
119119

120120
This feedback comes from developers who have worked on plugins for
121-
Open MCT Web, but have not worked on the platform.
121+
Open MCT, but have not worked on the platform.
122122

123123
### Plugin Developer 1
124124

125-
Used Open MCT Web over the course of several months (on a
125+
Used Open MCT over the course of several months (on a
126126
less-than-half-time basis) to develop a
127127
spectrum visualization plugin.
128128

@@ -138,7 +138,7 @@ spectrum visualization plugin.
138138

139139
### Plugin Developer 2
140140

141-
Used Open MCT Web over the course of several weeks (on a half-time basis)
141+
Used Open MCT over the course of several weeks (on a half-time basis)
142142
to develop a tabular visualization plugin.
143143

144144
* Pain points
@@ -197,7 +197,7 @@ to develop a tabular visualization plugin.
197197
## Long-term Developer Notes
198198

199199
The following notes are from original platform developer, with long
200-
term experience using Open MCT Web.
200+
term experience using Open MCT.
201201

202202
* Bundle mechanism allows for grouping related components across concerns,
203203
and adding and removing these easily. (e.g. model and view components of
@@ -220,7 +220,7 @@ or reducing the Angular dependency.
220220

221221
### Angular's Role
222222

223-
Angular is Open MCT Web's:
223+
Angular is Open MCT's:
224224

225225
* Dependency injection framework.
226226
* Template rendering.
@@ -268,7 +268,7 @@ by experience:
268268

269269
* Feedback from new developers is that Angular was a hindrance to
270270
training, not a benefit. ("One more thing to learn.") Significant
271-
documentation remains necessary for Open MCT Web.
271+
documentation remains necessary for Open MCT.
272272
* Expected enhancements to maintainability will be effectively
273273
invalidated by an expected Angular end-of-life.
274274
* Data binding and automatic view updates do save development effort,
@@ -526,7 +526,7 @@ subset of `$http`'s functionality.
526526

527527
### Detriments
528528

529-
* Increases the number of interfaces in Open MCT Web. (Arguably,
529+
* Increases the number of interfaces in Open MCT. (Arguably,
530530
not really, since the same interfaces would exist if exposed
531531
by Angular.)
532532

@@ -574,7 +574,7 @@ This would also allow for "composite bundles" which serve as
574574
proxies for multiple bundles. The `BundleContext` could contain
575575
(or later be amended to contain) filtering rules to ignore
576576
other bundles and so forth (this has been useful for administering
577-
Open MCT Web in subtly different configurations in the past.)
577+
Open MCT in subtly different configurations in the past.)
578578

579579
### Benefits
580580

@@ -827,7 +827,7 @@ This could be resolved by:
827827

828828
## Nomenclature Change
829829

830-
Instead of presenting Open MCT Web as a "framework" or
830+
Instead of presenting Open MCT as a "framework" or
831831
"platform", present it as an "extensible application."
832832

833833
This is mostly a change for the developer guide. A
@@ -1040,7 +1040,7 @@ This is a more specific variant of
10401040
* Removes a whole category of API (bundle definitions), reducing
10411041
learning curve associated with the software.
10421042
* Closer to Angular style, reducing disconnect between learning
1043-
Angular and learning Open MCT Web (reducing burden of having
1043+
Angular and learning Open MCT (reducing burden of having
10441044
to learn multiple paradigms.)
10451045
* Clarifies "what can be found where" (albeit not perfectly)
10461046
since you can look to module dependencies and follow back from there.

example/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
11
This directory is for example bundles, which are intended to illustrate
2-
how to author new software components using Open MCT Web.
2+
how to author new software components using Open MCT.

example/builtins/bundle.js

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
/*****************************************************************************
2-
* Open MCT Web, Copyright (c) 2014-2015, United States Government
2+
* Open MCT, Copyright (c) 2014-2016, United States Government
33
* as represented by the Administrator of the National Aeronautics and Space
44
* Administration. All rights reserved.
55
*
6-
* Open MCT Web is licensed under the Apache License, Version 2.0 (the
6+
* Open MCT is licensed under the Apache License, Version 2.0 (the
77
* "License"); you may not use this file except in compliance with the License.
88
* You may obtain a copy of the License at
99
* http://www.apache.org/licenses/LICENSE-2.0.
@@ -14,7 +14,7 @@
1414
* License for the specific language governing permissions and limitations
1515
* under the License.
1616
*
17-
* Open MCT Web includes source code licensed under additional open source
17+
* Open MCT includes source code licensed under additional open source
1818
* licenses. See the Open Source Licenses file (LICENSES.md) included with
1919
* this source code distribution or the Licensing information page available
2020
* at runtime from the About dialog for additional information.

0 commit comments

Comments
 (0)