Pete Richards
12c6e53939
Merge remote-tracking branch 'github-open/open157' into open-master
2015-10-09 09:47:23 -07:00
Victor Woeltjen
d902943552
[Time Conductor] Satisfy JSLint
...
...in preparation to merge pull request nasa/openmctweb#162
2015-10-09 09:36:57 -07:00
Victor Woeltjen
5f7c8ccadb
Merge remote-tracking branch 'github/master' into open117b
2015-10-09 09:35:07 -07:00
Victor Woeltjen
520d17f9db
[Time Conductor] Test span constraints
...
Verify that inner and outer spans do not become zero when
user input might otherwise cause this.
2015-10-09 09:29:01 -07:00
Victor Woeltjen
7532db5f49
[Time Conductor] Add test cases
...
Add test cases to TimeRangeController; testing existing functionality
in the context of nasa/openmctweb#151
2015-10-09 07:58:10 -07:00
Victor Woeltjen
ebd8fdeee3
[Time Conductor] Enforce inner minimums on outer changes
2015-10-09 07:32:46 -07:00
Victor Woeltjen
f738f84075
[Time Conductor] Enforce minimum outer span
2015-10-08 16:02:47 -07:00
Victor Woeltjen
cc19a0acba
[Time Conductor] Enforce minimum inner span
...
nasa/openmctweb#151 .
2015-10-08 15:51:23 -07:00
Victor Woeltjen
1ca2b769d9
[Common UI] Test popupService
2015-10-02 15:44:36 -07:00
Victor Woeltjen
a1d1261179
[Common UI] Test Popup
2015-10-02 14:58:20 -07:00
Victor Woeltjen
99048a4ee3
[Info Service] Update spec
...
...to reflect usage of popupService.
2015-10-02 14:49:27 -07:00
Victor Woeltjen
553b17fafe
[Common UI] Update mct-popup spec
...
...to reflect usage of popupService.
2015-10-02 14:36:04 -07:00
Victor Woeltjen
c4aff95341
[Common UI] Add empty specs for popupService
2015-10-02 14:15:31 -07:00
Victor Woeltjen
1ad0bf337c
[Common UI] Use popupService from mct-popup
2015-10-02 10:48:45 -07:00
Victor Woeltjen
73dc16d398
[Info Service] Render info bubble after positioning
...
Render info bubble after positioning with the popupService,
to apply arrow classes appropriately.
2015-10-02 10:21:42 -07:00
Victor Woeltjen
bebe53820f
[Info Service] Choose arrow direction
2015-10-02 09:36:27 -07:00
Victor Woeltjen
dfe909d6b5
[Time Conductor] Show appropriate arrow
...
...on info bubbles, when using bubbles shown via the
popupService.
2015-10-01 16:59:12 -07:00
Victor Woeltjen
6cbd3e5fae
[Time Conductor] Use popupService from infoService
2015-10-01 16:25:33 -07:00
Victor Woeltjen
3050b265fb
[Time Conductor] Expose popupService
2015-10-01 15:27:36 -07:00
Victor Woeltjen
5104a7990a
[Time Conductor] Add popupService
...
...to consolidate positioning of popups, based on
commonality between InfoService and MCTPopup.
nasa/openmctweb#104 .
2015-10-01 15:26:00 -07:00
Victor Woeltjen
571beb8df2
[Time Conductor] Add JSDoc to mct-popup
...
Based on feedback from code review; WTD-1515
2015-10-01 14:34:52 -07:00
Charles Hacskaylo
333f7cb848
[Frontend] Time controller-related styling
...
open #1515
open #117
Markup changed to utilize mct-representation via CSS;
time-controller now uses list-based _constants values;
ConductorRepresenter.js modded to remove inline styling
and to add CSS classes to enclosing mct-representation;
2015-09-29 08:43:34 -07:00
Victor Woeltjen
f198c281bc
[Mobile] Suppress Create button on mobile
...
nasa/openmctweb#157
2015-09-28 15:57:55 -07:00
Charles Hacskaylo
23de3917bb
[Frontend] Time Controller Markup and Styling
...
open #1515
open #117
Animation added to .knob and .range;
2015-09-27 16:24:43 -07:00
Charles Hacskaylo
badaca53d3
[Frontend] Time Controller Markup and Styling
...
open #1515
open #117
Significant mods to slider scss;
Added toi-line element and hover styles;
2015-09-25 18:12:36 -07:00
Charles Hacskaylo
e33485ec59
[Frontend] Time controller-related styling (CP > open117)
...
open #1515
open #117
Further refinements to slider knob and range look;
(cherry picked from commit 63a1239)
2015-09-25 13:57:57 -07:00
Charles Hacskaylo
afb1202865
[Frontend] Time controller-related styling (CP > open117)
...
open #1515
open #117
Layout styling in datetime picker;
Modded picker to hide time selects area
when time options are null;
(cherry picked from commit 6721093)
2015-09-25 13:57:43 -07:00
Charles Hacskaylo
7a677062e4
[Frontend] Time controller-related styling (CP > open117)
...
open #1515
open #117
Fixing selects;
Tweaks to constants and mixins to better
handle button dropshadowing across
themes;
(cherry picked from commit 3e34d06)
2015-09-25 09:50:36 -07:00
Charles Hacskaylo
a7153f320f
[Frontend] Time controller-related styling (CP > open117)
...
open #1515
open #117
Fixing selects;
Minor tweak to normalize espresso/.../mixins.scss;
(cherry picked from commit 2866d56)
2015-09-25 09:50:02 -07:00
Charles Hacskaylo
b3da6edd0c
[Frontend] Time Controller Markup and Styling
...
open #1515
open #117
Significant new vals added to constants files
for datetime picker/calendar;
Styling for calendar, hover and selected states;
Modded DateTimePickerController.js and markup
to allow selection of out-of-month cells;
2015-09-24 18:36:56 -07:00
Charles Hacskaylo
67f627b51f
[Frontend] Time Controller Markup and Styling
...
open #1515
open #117
Commit prior to redoing markup of picker to use flex instead of table;
Styling in picker; tabular styles fixed somewhat;
2015-09-24 16:42:45 -07:00
Charles Hacskaylo
1d83516982
[Frontend] Time Controller Markup and Styling
...
open #1515
open #117
Significant re-org in menus.scss continued:
Refactored s-menu to s-menu-btn;
moved look-related style def's into .s-menu;
.menu now extends .s-menu;
2015-09-24 15:38:52 -07:00
Charles Hacskaylo
9e64dfe3b9
[Frontend] Time Controller Markup and Styling
...
open #1515
open #117
Tweaks to tick spacing;
2015-09-24 14:31:26 -07:00
Charles Hacskaylo
09f5fa42ab
Merge branch 'open1515' of https://github.com/nasa/openmctweb into open117
2015-09-24 14:21:38 -07:00
Charles Hacskaylo
54a077a4e2
[Frontend] Time Controller Markup and Styling
...
open #1515
open #117
Tweak to mixin "test";
2015-09-24 14:20:25 -07:00
Charles Hacskaylo
404d1e7801
[Frontend] Time Controller Markup and Styling
...
open #1515
open #117
Begin work on styling the datetime picker;
2015-09-24 11:29:28 -07:00
Victor Woeltjen
1214a32c26
[Common UI] Avoid apply-in-a-digest
...
Don't invoke from mct-resize when first observing
an element's size during linking; observed issue in the
context of adding domain selector to time conductor.
2015-09-24 11:20:07 -07:00
Victor Woeltjen
6bd8e7a47c
Merge remote-tracking branch 'github/master' into open1515
2015-09-24 11:17:13 -07:00
Charles Hacskaylo
825d93cee3
[Frontend] Time Controller Markup and Styling
...
open #1515
open #117
Changed slider elements layout from relative to
absolute positioning;
Refined layout in input-holder;
Tweaks to hover classes;
2015-09-24 10:34:32 -07:00
Charles Hacskaylo
9f7dc1da9b
[Frontend] Time Controller Markup and Styling
...
open #1515
open #117
Styling for boundary inputs and
slider;
2015-09-23 18:59:36 -07:00
Charles Hacskaylo
9811443c71
Merge branch 'master' into open117
2015-09-23 15:54:48 -07:00
Pete Richards
6ce4ce6ada
Merge remote-tracking branch 'github-open/open139-1' into open-master
2015-09-23 13:51:55 -07:00
Pete Richards
70bc17c79f
Merge remote-tracking branch 'github-open/open97' into open-master
2015-09-23 13:44:48 -07:00
Victor Woeltjen
dbe1875e70
[Themes] Resolve conflicts
...
Resolve conflicts in preparation for merge, nasa/openmctweb#118
2015-09-22 16:12:44 -07:00
Pete Richards
aba0969312
Merge branch 'mobile-integration' into open-master
2015-09-22 13:53:22 -07:00
Pete Richards
2040304980
Merge remote-tracking branch 'github-open/open19' into open-master
2015-09-22 13:49:41 -07:00
Victor Woeltjen
56ccf29cfe
[Persistence] Include timestamp on creation
...
Include a persisted timestamp when an object is first
created. nasa/openmctweb#139
2015-09-22 11:32:18 -07:00
Pete Richards
8b7a94dcf8
[Style] Remove unused variables, excess whitespace
...
Clean up unused variables and excess whitespace to match style guide.
2015-09-22 11:14:55 -07:00
Pete Richards
3e5d294a28
[SCSS] Fixed typo
...
Changed tmpBorder mixin to specify '@include' instead of '@iclude'. This
does not change the output CSS which means the tmpBorder mixin is not
used anywhere and could be removed.
2015-09-22 10:57:30 -07:00
Charles Hacskaylo
54334a8906
[Frontend] Setting default theme for open back to espresso
...
open #95b
Also removed unused COMPILE.scss file;
2015-09-21 14:26:50 -07:00
Charles Hacskaylo
c9b2f5804d
[Frontend] Minor tweaks to sizing of controls
...
open #95b
View switcher and plot control buttons now made small
when object is in a frame context in a Layout;
2015-09-21 14:24:19 -07:00
Victor Woeltjen
0c1f77cfab
[Mobile] Collapse tree on click
...
Collapse tree any time a user does an action in the
tree that would select an object; don't only do this
on navigation changes, because this fails to detect
occasions where user clicks the already-navigated-to
object.
2015-09-21 10:53:45 -07:00
Victor Woeltjen
ae4313253c
[Mobile] Test mct-device
2015-09-18 16:47:50 -07:00
Victor Woeltjen
1e6c4732f1
[Mobile] Consolidate BrowseTreeController
...
Make mobile variant of BrowseTreeController the regular version
of that controller; Browse mode has a dependency on mobile by
way of the mct-device directive anyway.
2015-09-18 15:55:58 -07:00
Victor Woeltjen
884d36ad6d
[Mobile] Test BrowseTreeController variants
2015-09-18 15:49:55 -07:00
Victor Woeltjen
24586ae378
[Mobile] Remove BackArrowController
...
Remove BackArrowController; behavior can be implemented
in template.
2015-09-18 15:29:55 -07:00
Victor Woeltjen
cf97b30084
[Mobile] Add empty specs
2015-09-18 15:21:23 -07:00
Victor Woeltjen
e86e61c2ac
[Mobile] Fix test setup error
...
Use correct user agent strings for iPhone/iPad
(these had been reversed in the spec.)
2015-09-18 15:12:48 -07:00
Victor Woeltjen
befa66a9e2
[Mobile] Remove obsolete test cases
...
...for functionality that has been moved out of TreeNodeController.
2015-09-18 14:54:37 -07:00
Victor Woeltjen
5a1c83fca8
[Mobile] Update spec for AgentService
2015-09-18 14:53:14 -07:00
Victor Woeltjen
88bb213162
[Mobile] Move spec for AgentService
2015-09-18 14:34:14 -07:00
Victor Woeltjen
bf05e55d02
[Mobile] Use mct-device in tree nodes
2015-09-18 12:25:51 -07:00
Victor Woeltjen
c057ba38a5
[Mobile] Add mct-device directive
...
Add directive which can be used to include certain elements
only on specific devices.
2015-09-18 12:13:37 -07:00
Victor Woeltjen
70bcb723ef
[Mobile] Small tweaks/bug fixes
...
Small tweaks/fixes (use appropriate variable names etc) for
refactoring mobile support classes.
2015-09-18 12:13:05 -07:00
Victor Woeltjen
4c5808c8c9
[Mobile] Move mobile-specific behavior to template
2015-09-18 11:01:54 -07:00
Victor Woeltjen
fa186a1556
[Mobile] Update agentService usages
2015-09-18 10:07:27 -07:00
Victor Woeltjen
0b4f44f00d
[Mobile] Remove leading slash, redundant declaration
2015-09-18 09:18:19 -07:00
Victor Woeltjen
dce7253b27
[Mobile] Move mobile bundle
2015-09-18 09:17:01 -07:00
Victor Woeltjen
1d1589da68
[Mobile] Move agentService to mobile bundle
...
...and make API tweaks.
2015-09-17 18:05:48 -07:00
Victor Woeltjen
6aba34dd5a
[Mobile] Override browse behavior
...
Override browse tree behavior such that tree collapses upon
navigation change in mobile.
2015-09-17 17:54:01 -07:00
Victor Woeltjen
19500c2704
[Mobile] Restore browse controller from master
2015-09-17 17:42:38 -07:00
Victor Woeltjen
2090b1a958
[Browse] Separate tree expand/collapser
2015-09-17 17:03:35 -07:00
Victor Woeltjen
cc3b0ecfca
Merge branch 'open-master' into mobile
...
Merge in latest from master branch into mobile branch
2015-09-17 16:40:48 -07:00
Charles Hacskaylo
9a7f435b61
[Frontend] Minor color tweaks in Snow theme
...
open #95
vista #65
(cherry picked from commit 98c5334)
2015-09-17 09:58:13 -07:00
Charles Hacskaylo
9fdb9f0170
[Frontend/PLATFORM] Cherry picking from platform changes in vista65
...
open #95
vista #65
Style mods for selects;
(cherry picked from commit 8b2c4c6)
2015-09-16 17:18:58 -07:00
Charles Hacskaylo
f28d2f19d0
[Frontend/PLATFORM] Cherry picking from platform changes in vista65
...
open #95
vista #65
scss and html mods for VISTA-related elements;
(cherry picked from commit 6ef3987)
2015-09-16 17:17:54 -07:00
Victor Woeltjen
8f24e014e0
[Time Conductor] Add skeleton specs
...
Add skeleton specs to new classes added for date-time
picker in time conductor. WTD-1515
2015-09-16 16:51:28 -07:00
Charles Hacskaylo
4f5a1115d2
[Frontend] Themes final on open prior to VISTA integration
...
open #95
Branch open95b now replaces open95;
Fix to status indicator to only
display when title length > 0;
2015-09-16 10:45:22 -07:00
Victor Woeltjen
7a97588aa5
[Time Conductor] Remove debugging statement
...
WTD-1515
2015-09-16 10:30:45 -07:00
Victor Woeltjen
e34fe1a289
[Time Conductor] Tweak position, appearance
...
...of datetime picker popups. WTD-1515
2015-09-15 18:51:44 -07:00
Victor Woeltjen
70d9587c9b
[Time Conductor] Wire in datetime pickers
...
WTD-1515
2015-09-15 18:48:00 -07:00
Victor Woeltjen
9a78b63065
[Time Conductor] Try to rewrite datetime picker as control
2015-09-15 18:37:36 -07:00
Victor Woeltjen
6c497f3c36
[Time Conductor] Start adding datetime picker
...
WTD-1515
2015-09-15 18:09:46 -07:00
Victor Woeltjen
d951b794e3
[Time Conductor] Support date choice
...
...from date-time picker. WTD-1515
2015-09-15 15:55:13 -07:00
Victor Woeltjen
797046aca4
[Time Conductor] Populate datetime picker
...
WTD-1515
2015-09-15 15:24:54 -07:00
Victor Woeltjen
cf76583ed7
[Time Conductor] Add inline styles to datetime-picker
2015-09-15 14:50:05 -07:00
Victor Woeltjen
6f28ab0145
[Time Conductor] Begin adding custom date picker
...
WTD-1515
2015-09-15 13:08:05 -07:00
Victor Woeltjen
d981e7bb1d
[Browse] Separate out back-arrow behavior
...
Supports integration of changes for mobile, nasa/openmct#95
2015-09-15 12:18:57 -07:00
Victor Woeltjen
a3a6706869
[Browse] Separate out back-arrow behavior
...
Supports integration of changes for mobile, nasa/openmct#95
2015-09-15 12:13:11 -07:00
Victor Woeltjen
72c122e0ee
Merge remote-tracking branch 'github/master' into open95b
...
Conflicts:
platform/commonUI/edit/src/actions/RemoveAction.js
2015-09-15 11:35:25 -07:00
Victor Woeltjen
d0b5bb2d21
[Time Conductor] Begin using date-time controls
...
WTD-1515
2015-09-15 10:00:41 -07:00
Victor Woeltjen
cd98886a43
[Time Conductor] Add license header
...
WTD-1515
2015-09-15 08:59:57 -07:00
Victor Woeltjen
4549828cae
Merge remote-tracking branch 'github/master' into open1515
2015-09-15 08:57:49 -07:00
Charles Hacskaylo
3e5d46a62b
[Frontend] IN-PROGRESS Theme changes continuing
...
open #95
Limits, plots, etc.;
Misc sanding and shimming;
Updated symbols font to replace missing
Info symbol;
2015-09-11 16:25:19 -07:00
Victor Woeltjen
47bfe40294
[Common UI] Remove unused variable
...
...from mct-splitter directive.
2015-09-11 13:40:25 -07:00
Victor Woeltjen
3a3829682c
[Common UI] Only trigger digest on change
...
...from mct-split-pane.
2015-09-11 13:33:17 -07:00
Victor Woeltjen
861ea8bab7
[Common UI] Poll split pane position
...
Poll to position the splitter in an mct-split-pane, in
order to detect later style changes. #53 .
2015-09-11 13:12:24 -07:00
Charles Hacskaylo
a840b59044
[Frontend] IN-PROGRESS Theming continues, sanding
...
open #95
Fixed grid icon hover color;
Various color normalization;
2015-09-10 15:58:00 -07:00
Charles Hacskaylo
d14c4e08b8
[Frontend] IN-PROGRESS Theming continues
...
open #95
Shadow and color normalization: fixed-position, tabular;
Updated paint bucket and icon-box in symbols font;
Custom checkboxes now use inset shdw;
2015-09-10 15:01:51 -07:00
Victor Woeltjen
de6dfe1fdc
Merge remote-tracking branch 'github/master' into mobile
...
Merge in latest from master into mobile branch
to reconcile conflicts
Conflicts:
platform/commonUI/edit/src/actions/RemoveAction.js
2015-09-10 15:01:38 -07:00