Commit Graph

3538 Commits

Author SHA1 Message Date
Henry
2056d87453 Merge branch 'open933-frontend' into open933 2016-07-11 14:27:30 -07:00
Charles Hacskaylo
64ce8a2b2a [Frontend] Styling for Time Conductor v2
Fixes #933
Color adjusts, mini super-menu size
and font tweaks, glyphs added to selector,
SVG style fixes in progress
2016-07-11 14:03:41 -07:00
Henry
585da38a16 Fixed some merge issues 2016-07-11 13:46:46 -07:00
Charles Hacskaylo
bf0e85a94c [Frontend] Styling for Time Conductor v2
Fixes #933
Renamed main class; removed unused <style>
defs
2016-07-11 11:35:26 -07:00
Charles Hacskaylo
84b7a9dc2f Merge remote-tracking branch 'origin/open933' into open933-frontend
Fixes #933
Conflicts:
	platform/features/conductor-v2/src/TimeConductorController.js
2016-07-11 11:29:35 -07:00
Henry
11caa8396a Updated modes 2016-07-11 11:18:23 -07:00
Henry
0017b77439 Merged markup changes 2016-07-11 11:06:22 -07:00
Charles Hacskaylo
7b7b21d748 [Frontend] Styling of Time Conductor v2
Fixes #933
Tweaks to language; tweak to class name in markup
2016-07-11 11:05:47 -07:00
Charles Hacskaylo
788483ec13 [Frontend] Styling of Time Conductor v2
Fixes #933
Tweaks to language
2016-07-11 10:37:08 -07:00
Charles Hacskaylo
7b19f91ce6 [Frontend] Merge latest from open933
Fixes #933
Resolve conflicts in
mode-menu.html, mode-selector.html,
time-conductor.html; apply tweaks, language, etc.
2016-07-11 10:31:14 -07:00
Henry
5cc81ba12a [Time Conductor] Added mode class to time conductor 2016-07-11 10:26:34 -07:00
Charles Hacskaylo
0a0bc55f5f [Frontend] Styling for Time Conductor v2
Fixes #993
In-progress; mode menu names and
descriptors modified, markup cleaned up
2016-07-08 17:11:43 -07:00
Henry
4e7b69c4df Enabled fixed and real-time modes 2016-07-08 16:57:50 -07:00
Charles Hacskaylo
cf83040c4b [Frontend] Styling for Time Conductor v2
Fixes #993
In-progress; Create menu refactoring and new
mini Create menu
2016-07-08 16:54:49 -07:00
Charles Hacskaylo
32f7bc86af [Frontend] Styling for Time Conductor v2
Fixes #993
In-progress; class renaming continued,
cleanups in markup file, in-page styles
ported to scss
2016-07-08 16:54:13 -07:00
Henry
e230b92946 Fixed bug with date selector having to be clicked twice 2016-07-08 15:15:12 -07:00
Henry
58ed500ecf Time sync via conductor 2016-07-07 16:57:03 -07:00
Henry
bca5eb0fdb [Time Conductor] #933 Initial markup 2016-07-07 09:47:46 -07:00
Pete Richards
652a50c700 Merge remote-tracking branch 'origin/open1018-new' 2016-06-27 09:13:03 -07:00
Andrew Henry
2339560363 [Time Conductor] Bounds updated when date selected from date selector. Fixes #1018 2016-06-24 21:50:59 -07:00
Pete Richards
24e870a126 [Save] Show blocking dialog
Show a blocking dialog while the save action is being performed.

Prevents users from pressing save a second time or performing
further actions while a save is in progress.

Fixes https://github.jpl.nasa.gov/MissionControl/vista/issues/362
2016-06-24 20:01:52 -07:00
Pete Richards
c8f4568bd0 [Plot] Set min height
Set the min height for the plot element based on user feedback for
minimum plot size that they find useful.  Plot ticks may overlap
but that is expected to be fixed in a future release.

Fixes https://github.com/nasa/openmct/issues/1048
2016-06-22 10:51:16 -07:00
Victor Woeltjen
cefb40856b Merge pull request #1042 from nasa/open1040
[Tables] Enabled auto-scroll by default fixes #1040
2016-06-20 16:24:58 -07:00
Henry
ee7c450e11 [Tables] Enabled auto-scroll by default fixes #1040 2016-06-20 16:18:26 -07:00
Charles Hacskaylo
8080490e5c [Frontend] Applied emphasis colors to .key-properties
fixes #1014
Added .key-properties to .major to color the Edit
button as intended;
2016-06-20 16:06:23 -07:00
Victor Woeltjen
a3443d8077 Merge pull request #1025 from nasa/frontend-1019
R&I fixes for Snow button colors and Timeline edit Add menu
2016-06-20 12:36:29 -07:00
Charles Hacskaylo
dea94e4e68 [Frontend] Fix button colors in Snow theme
Fixes #1014
- Problem was actually application of a color
within the .icon class - fix removes that
definition;
2016-06-16 17:55:40 -07:00
Charles Hacskaylo
d40c7f1821 [Frontend] Restore the Add menu to edit Timelines
Fixes #1019
- Removed overflow: hidden from .l-edit-controls;
2016-06-16 17:46:15 -07:00
Charles Hacskaylo
c7e7e0c302 [Frontend] Fixes to un-squish plots
Fixes #1022
- min-height added to .gl-plot element;
- Moved plot value definitions out of _plots-main
and into _constants and normalized naming;
2016-06-16 17:24:44 -07:00
Pete Richards
8ac6ac97f0 Merge remote-tracking branch 'origin/open972' 2016-06-16 11:08:43 -07:00
Henry
c2517c1670 [Edit Mode] Canceling edit mode with unsaved changes now shows confirmation dialog to user. Fixes #664 2016-06-15 17:10:29 -07:00
Andrew Henry
717ceff02c Merge pull request #995 from nasa/timeline-913a
R&I tweaks to Timeline scrollbar and splitters
2016-06-15 11:45:17 -07:00
Victor Woeltjen
6878c59f45 Merge pull request #1016 from nasa/fix-1013
[Persistence] Use identifier service to get key
2016-06-15 11:18:13 -07:00
Pete Richards
c00b053aa7 [Tests] verify that identifier service provides key
Verify that the results of the identifier service are used for
persistence calls instead of the domain object id.

https://github.com/nasa/openmct/issues/1013
2016-06-15 10:31:25 -07:00
Victor Woeltjen
50bd233b0a Merge remote-tracking branch 'origin/master' into table-export-934
Conflicts:
	platform/commonUI/general/res/sass/controls/_buttons.scss
	platform/features/table/res/templates/mct-table.html
2016-06-15 10:05:20 -07:00
Henry
79406cf1ed [Tables] #972 Refactored to simplify code. Fixes #972 2016-06-14 16:34:07 -07:00
Pete Richards
2d5824c4ab [Persistence] Use identifier service to get key
Retrieve key from identifier service for all persist operations.

Fixes https://github.com/nasa/openmct/issues/1013
2016-06-14 10:56:54 -07:00
Pete Richards
3480809129 Merge remote-tracking branch 'origin/open629' 2016-06-14 10:44:58 -07:00
Pete Richards
11bc48c7e0 Merge remote-tracking branch 'origin/timeline-console-error-978' 2016-06-14 10:41:26 -07:00
Pete Richards
d759401b69 Merge remote-tracking branch 'origin/open1000' 2016-06-14 10:38:51 -07:00
Victor Woeltjen
0aebecfbb0 Merge pull request #987 from nasa/anim-to-edit-709
[Frontend] Animation added to transition from browse to edit mode
2016-06-13 13:31:49 -07:00
Pete Richards
531d40993a Merge remote-tracking branch 'origin/better-dialog-message-339' 2016-06-10 14:55:07 -07:00
Pete Richards
4c097faf88 Merge remote-tracking branch 'origin/timeline-flash-997' 2016-06-10 14:50:36 -07:00
Victor Woeltjen
5152e64895 [Duplicate] Allow copy across spaces
Fixes #1007
2016-06-10 11:38:55 -07:00
Andrew Henry
acd0fae040 [Tables] Recalculate column dimensions on resize. Fixes #861 2016-06-09 12:59:46 +01:00
Andrew Henry
29dd51439d [Date Input] Addressed issues with date selector. Fixes #1000 2016-06-08 17:37:26 +01:00
Victor Woeltjen
a1b2175801 [Timeline] Reduce flicker
Reposition scroll bar in Timeline with RAF instead of timeout;
this ensures that scroll bar is positioned after the current
digest (updating the width) but before the results are rendered
(avoiding flicker.) Fixes #997
2016-06-07 10:05:51 -07:00
Charles Hacskaylo
8e0858bb24 [Frontend] Tweaks to splitter dimensions
Fixes #913
- Tightened up splitter height and width;
- Added hover color for snow theme;
2016-06-03 10:00:16 -07:00
Victor Woeltjen
23b64951f3 [Timeline] Update zoom controller spec
...to reflect changes/simplifications for #936.
2016-06-02 16:42:09 -07:00
Victor Woeltjen
99590d18f7 [Timeline] Simplify bounds-tracking 2016-06-02 16:40:07 -07:00