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