Merge in latest from master into topic branch for
nasa/openmctweb#115
Conflicts:
platform/features/conductor/src/ConductorRepresenter.js
platform/features/conductor/src/ConductorTelemetrySeries.js
platform/features/conductor/src/TimeConductor.js
platform/features/conductor/test/ConductorRepresenterSpec.js
platform/features/conductor/test/ConductorTelemetrySeriesSpec.js
open #159
open #170
Added Cancel button to Messages dialog in DialogService.js;
Important tweaks to layout of messages to allow
bottom-bar to align to bottom in singleton dialog view;
Revised status colors in theme's constants files;
open #159
open #170
CSS, markup and JS test files initially complete;
Templates renamed for consistency;
message-type icons styled;
Added severity constant "alert";
TO-DO: check refactored CSS against mobile,
see what's broken;
open #159
open #170
Thank you @akhenry;
launchMessages function added to DialogLaunchController.js;
New message-list.html template;
message.html is now its own include;
blocking-message.html renamed to
overlay-blocking-message.html;
open #159
open #170
Restructured overlay size and positioning approach
for better flexibility;
Getting new dialogs and the overlay to
play nicely in mobile context;
open #159
open #170
OverlayService can now be passed typeClass,
which is added to the CSS class of the overlay's
mct-include tag - intent is to allow the overlay
to size itself based on the type of content to be
displayed;
open #159
open #170
Properly re-cast model.hint and added model.actionText;
Moved progressText into progress-bar.html;
Tweaks to dialog styles;
Tweaked styles for progress bar;
Normalized various dialog templates markup;
open #163
open #170
Squashed commit of the following:
commit ec7edb58ca
Author: Henry <akhenry@aitutaki.ndc.nasa.gov>
Date: Mon Oct 5 10:39:06 2015 -0700
Rename dialogSeverity to messageServity for reuse with notifications
commit d20abe01dd
Author: Henry <akhenry@aitutaki.ndc.nasa.gov>
Date: Fri Oct 2 16:40:29 2015 -0700
Fixed docs
commit 227da18498
Author: Henry <akhenry@aitutaki.ndc.nasa.gov>
Date: Fri Oct 2 16:27:41 2015 -0700
Added semicolon
commit 22d424f96e
Author: Henry <akhenry@aitutaki.ndc.nasa.gov>
Date: Fri Oct 2 16:26:29 2015 -0700
Fixed code errors
commit 2c77c3647c
Author: Henry <akhenry@aitutaki.ndc.nasa.gov>
Date: Fri Oct 2 16:24:01 2015 -0700
Initial commit of blocking dialog service with test code to demonstrate usage
Per discussion from nasa/openmctweb#141, minimize the
interval at which new objects get indexed, instead of
presuming requirements for CPU utilization.
