Commit Graph

4497 Commits

Author SHA1 Message Date
748673f99b Merge branch 'master' into open638_rebase 2016-03-01 10:48:53 -08:00
78374f8241 Merge branch 'open401' 2016-03-01 10:37:12 -08:00
bc6185f76d [Browse] Remove unused constant
https://github.com/nasa/openmctweb/issues/401
2016-03-01 10:36:30 -08:00
747a98d130 Addressed issues from code review 2016-02-29 18:42:48 -08:00
7daaecbf8f Merge pull request #710 from nasa/open673
[Templates] Load templates using RequireJS text plugin
2016-02-29 18:45:46 +00:00
6f9e78a14f Merge pull request #711 from nasa/open442a
[Frontend] Markup, CSS changes
2016-02-29 17:36:54 +00:00
beee4136a6 Merge pull request #702 from nasa/open164
Review and integrate open164
2016-02-26 16:49:26 -08:00
5a9bcfa938 [Frontend] Markup, CSS changes
#442
Removed white space from markup;
Moved getGlyphClass up to status-block-holder
element out of status-block;
CSS mods to selectors and style defs
in _messages.scss;
2016-02-26 16:48:23 -08:00
721557b814 [Templates] Exercise selection method
...add to TimelineSwimlanePopulator to reflect changes to
time at which selection object may become available as
a consequence to changes in the way templates are normally
loaded. #673
2016-02-26 16:29:06 -08:00
70ed16491a [Templates] Change watch order
...to work around order-sensitive test case
2016-02-26 16:26:31 -08:00
7240ff4f8d [Templates] Update mct-control spec
...to reflect usage of templateLinker, to support including
templates via RequireJS text plugin
2016-02-26 16:22:55 -08:00
3a6e0be2d7 [Templates] Update FixedController spec
...to reflect changes to how selection object is obtained,
which in turn reflects change to using templates obtained
via RequireJS text plugin, instead of loading by URL.
2016-02-26 16:19:14 -08:00
9b21b0b7f2 [Templates] Update mct-container spec
...to reflect change to template over templateUrl
2016-02-26 16:17:33 -08:00
164c2faf07 Merge branch 'master' into open673
Merge latest from master into topic branch for #673
2016-02-26 15:54:41 -08:00
894cf5c461 [Templates] Include templates in test configuration
...such that they are available to the RequireJS text plugin
for loading.
2016-02-26 15:53:35 -08:00
fe419714f5 [Templates] Check for availability of timespan
...as ordering changes due to change from templateUrl to template
may mean this is not available when first initialized.
2016-02-26 15:50:07 -08:00
f3fd2e67fc [Templates] Watch for selection object
...from Timeline, to ensure toolbar appears etc.
Reflects changes to ordering triggered by use of
template instead of templateUrl
2016-02-26 15:49:21 -08:00
931fa77cbe [Templates] Handle deferred selection availability
Loading templates via RequireJS text plugin means they are
immediately available; appears to have caused a change in
ordering wherein controllers for views may be initialized
before representers have installed things like selection
state. As such, need to watch for changes instead of simply
checking for a selection object when the controller is
initialized.
2016-02-26 15:37:19 -08:00
872c4021e3 Merge pull request #82 from tarikozket/patch-1
Fixed typo
2016-02-26 23:28:24 +00:00
26d29c3d92 Merge pull request #652 from nasa/open649
[CSV Export] Implement exportService
2016-02-26 23:18:12 +00:00
596735352a [Templates] Simplify MCTToolbar
Use mct-form as a basis; simply change the template.
2016-02-26 15:17:31 -08:00
402512a461 Merged from master to resolve conflict 2016-02-26 15:15:22 -08:00
2d03e3e6d4 [Templates] Remove unused template path calculation 2016-02-26 15:03:45 -08:00
19b442cc0b [Templates] Require data table templates
...via text plugin
2016-02-26 15:02:04 -08:00
5c3d8508a2 [Templates] Use templateLinker for forms
...for compatibility with both template and templateUrl
2016-02-26 15:01:40 -08:00
8581547a9c [Templates] Allow only template property for containers
...to work around difficulties with transclusion using
templateLinker.
2016-02-26 14:49:55 -08:00
192bbae6e5 [Frontend] Fix paths, includes
#702
Per https://github.com/nasa/openmctweb/pull/702;
Removed include of _logo-and-bg.scss into _about.scss;
2016-02-26 14:49:34 -08:00
e61711688e [Templates] Use templateLinker from MCTContainer
...for compatibility with both template and templateUrl.
2016-02-26 14:24:41 -08:00
a73f1ebbbd Merge pull request #637 from nasa/rems_data
[Examples] Rems data integration
2016-02-26 14:21:30 -08:00
4674918b4b [Examples] #359 Updated to attempt connection to remote data source and fallback to local if unavailable
Minor change to readme

Fixed JSLint errors

More JSLint errors

[Example] Rems data integration - disabled bundle by default.

[Examples] REMS data integration - added newlines at end of files

[Example] Added time conductor support to REMS data integration

Added caching of results

[Examples] Added domain format to REMS data #359

[Example] #637 Added local proxy to app.js to allow cross-origin requests

Updated readme
2016-02-26 14:03:10 -08:00
741d4476e6 [Templates] Use text plugin for toolbar 2016-02-26 13:12:35 -08:00
bf1fa0ac4c [Templates] Include templates using text plugin
Resolves #673
2016-02-26 13:07:50 -08:00
60efdb4ad3 [Templates] Add in-place rewrite step 2016-02-26 13:07:32 -08:00
8ea56486c5 [Templates] Normalize spacing 2016-02-26 13:03:06 -08:00
e13e068b6e [Templates] Begin teplacing templateUrl properties 2016-02-26 13:00:50 -08:00
852faf061e [Templates] Add parameter names for required templates 2016-02-26 12:52:02 -08:00
f2e4b01721 [Templates] Add template paths
...with text! prefix
2016-02-26 12:50:28 -08:00
930fed83e8 [Templates] Create variable names by template URL 2016-02-26 12:17:57 -08:00
4666292907 [Templates] Begin writing migration script
...to rewrite bundle.js files to load templates via
the RequireJS text plugin. #673
2016-02-26 12:12:13 -08:00
f04c3692c1 [Table] #670 Name column only prepended if multiple objects 2016-02-26 11:22:16 -08:00
ffa497f22f [Table] #670 Added new view type 'table' 2016-02-26 11:09:51 -08:00
0068348bb2 Merge pull request #704 from nasa/open703
[Examples] #703 Changed imagery telemetry metadata to use 'utc' format
2016-02-26 11:00:26 -08:00
bc3eb4ab8d [Frontend] New logo art
#164
New logo art for Open MCT added;
Removed console.log;
2016-02-26 10:59:54 -08:00
d203f3adc0 [Frontend] New logo art; paths changed
#164
Per comments in #702, abs paths changed
to relative;
New logo art for Open MCT added;
CSS tweaked as needed;
2016-02-26 10:15:15 -08:00
5e7eb7e87e [Examples] #703 Changed imagery telemetry metadata to use 'utc' format for time 2016-02-26 09:32:03 -08:00
1a2a2e66ca [Frontend] Removed commented styling
open #164
2016-02-25 12:41:54 -08:00
129b554f9d [Frontend] Significant markup/CSS mods for splash screen
#164
https://github.jpl.nasa.gov/MissionControl/vista/issues/299
App logo and bg files renamed;
Added openmct.scss to hold openmct-specific styles;
Renamed _startup.scss to startup-base.scss
which now renders its own .css file;

Still to-do: apply to WARP including needed
mods to its About dialog screen;
2016-02-24 17:47:24 -08:00
164d959f60 [Frontend] Significant markup/CSS mods for splash screen
#164
Markup in index.html and about-dialog.html
changed to simplify and use :before/:after psuedos;
CSS in _logo-and-bg.scss modded for same;
Added _startup.scss to hold general CSS for
the startup screen;
Renamed startup.scss to startup-open.scss;
Modified SplashScreenManager.js to target renamed
outer container .l-splash-holder;
Added media query for startup screen on phone;
Cleanup: moved classes out of _effects into _global;
Still to-do: apply to WARP and VISTA, including needed
mods to their About dialog screens;
2016-02-23 18:30:21 -08:00
99cf690ad4 Merge branch 'master' into open164 2016-02-23 16:03:24 -08:00
aabeb72203 [Plots] #638 Fixed failing test 2016-02-23 15:22:21 -08:00