ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-24 23:36:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
2,385 Commits 989 Branches 212 Tags 191 MiB
91a4138334
Commit Graph

952 Commits

Author SHA1 Message Date
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
Victor Woeltjen
2229e868ce [Time Conductor] Fix logic around end times 
Fix logic for updating end times after refactoring
to clarify variable/property naming, WTD-1515
 2015-09-10 13:24:50 -07:00
Charles Hacskaylo
3b2454c6a9 [Frontend] IN-PROGRESS Theming continues 
open #95
Search, plots;
Minor tweaks to add shdw to items and buttons;
 2015-09-10 11:43:39 -07:00
Victor Woeltjen
8d209f4d19 [Time Controller] Fix middle-drag bug 
Fix bug in middle-drag introduced by refactoring,
WTD-1515.
 2015-09-10 11:34:31 -07:00
Victor Woeltjen
78fae345da [Time Conductor] Rename TimeConductorController 
Rename TimeConductorController to TimeRangeController, to
reflect that this is intended to serve as a more general
control. Additionally, stop using arrays for inner and
outer bounds and instead use explicit start/end properties,
for clarity. WTD-1515
 2015-09-10 10:58:47 -07:00
Victor Woeltjen
426ab44d93 [Angular] Update Locator specs 
Update locator specs to provide expected functionality
of .
 2015-09-09 18:17:07 -07:00
Charles Hacskaylo
3792dab0f9 [Frontend] IN-PROGRESS Theme changes continuing 
open #95
Menus sanded and normalized;
 2015-09-09 17:25:10 -07:00
Victor Woeltjen
c6df7cebe5 [Angular] Check for context capability 
Check for existence of context capability from Remove action
during navigation check. This avoids an exception that
appears to have been swallowed in earlier versions of
Angular.
 2015-09-09 17:25:02 -07:00
Victor Woeltjen
52df7fe1e2 [Angular] Avoid infinite digest 
Avoid infinite digest loop from LocatorController associated
with upgrade to Angular 1.4.4
 2015-09-09 17:15:35 -07:00
Charles Hacskaylo
32b895ba62 [Frontend] IN-PROGRESS Theme changes continuing 
open #95
Refactored btnSubtle and containerSubtle mixins
to simplify;
 2015-09-09 16:49:59 -07:00
Charles Hacskaylo
4db48afab0 [Frontend] IN-PROGRESS Theme changes continuing 
open #95
Mostly about the overlay and forms;
Buttons, menus, selects tweaks continued;
Initial check and tweaks in mobile;
 2015-09-09 15:55:12 -07:00
Victor Woeltjen
52c471bd3a [Angular] Clean up InfoGesture workaround 
...and add comment pointing back to the Angular issue
which motivates the workaround.
 2015-09-08 21:14:46 -07:00
Victor Woeltjen
560c8612bd [Angular] Amend InfoGesture for compatibility 
Update the info gesture so that it does not schedule
multiple bubbles to be shown when multiple events fire,
for AngularJS 1.4.4 compatibility.
 2015-09-08 19:53:38 -07:00
Charles Hacskaylo
86deec6364 [Frontend] IN-PROGRESS Theme changes continuing 
open #95
Grid items;
 2015-09-04 18:06:18 -07:00
Charles Hacskaylo
ac41ed7d64 [Frontend] IN-PROGRESS Theme changes continuing 
open #95
Splitter styles updated;
Tree styles updated;
 2015-09-04 16:39:16 -07:00
Victor Woeltjen
c58ffb4a52 [Time Controller] Update inner span 
Update inner span when outer dates change (if needed),
WTD-1515
 2015-09-04 15:15:09 -07:00
Charles Hacskaylo
37c34c668c [Frontend] IN-PROGRESS Major restructuring of /platform/commonUI/ to add themes structure 
open #95
New themes bundle files, .scss and directories;
Moved constants definitions (mainly colors) from commonUI/.../_constants
to individual themes _constants files;
tweaks to mixins files;
changed pathways to font and images in commonUI/.../_constants;
 2015-09-03 15:34:39 -07:00
Victor Woeltjen
fc2860810b [Time Controller] Allow manual date entry 
WTD-1515
 2015-09-03 11:03:17 -07:00
Charles Hacskaylo
62898c921f Merge branch 'open95' of https://github.com/nasa/openmctweb into open95 2015-09-03 10:37:10 -07:00
Charles Hacskaylo
4997fc1417 Merge branch 'mobile' of https://github.com/nasa/openmctweb into open95 2015-09-03 10:36:23 -07:00
Charles Hacskaylo
bb1a02c8bd [Frontend] Significant re-factoring of CSS and markup 
open #95
IN-PROGRESS!;
Mostly buttons and menus classes (s-btn and s-menu);
Removed unused templates and .css files;
Normalized some button containers;
 2015-09-02 18:02:58 -07:00
Victor Woeltjen
9d6b70f433 [Time Conductor] Handle middle drag 
WTD-1515
 2015-09-02 17:25:41 -07:00
Victor Woeltjen
57a947eaef [Time Conductor] Accept drag gestures 
WTD-1515
 2015-09-02 17:19:20 -07:00
Victor Woeltjen
a18cc50a43 [Time Conductor] Begin binding control to data 2015-09-02 16:53:10 -07:00
Victor Woeltjen
91fe3d798f [Time Conductor] Begin adding controller 
WTD-1515
 2015-09-02 16:31:58 -07:00
Victor Woeltjen
3310016264 [Properties] Hide rows without controls 
Hide rows for domain object properties that do not have
associated controls from the Edit Properties dialog;
follow up for nasa/openmctweb#92
 2015-09-02 12:01:43 -07:00
Victor Woeltjen
b2649de649 [Composition] Update specs 
Update specs for changes to the return value of
composition.add, nasa/openmctweb#97
 2015-09-02 11:45:52 -07:00
Victor Woeltjen
b1238b0c96 [Composition] Return newly-contextualized object 
After adding to composition, return the newly-contextualized
object; this is regularly used by other services.
 2015-09-02 11:37:47 -07:00
Victor Woeltjen
8759fdbd95 [Composition] Update specs 
Update specs to reflect usage of the add method in
the composition capability.
 2015-09-02 09:37:26 -07:00
Victor Woeltjen
b9d8b124ff [Composition] Use composition.add from link action 2015-09-02 09:08:47 -07:00
Victor Woeltjen
8e995eba8f [Composition] Use composition.add during creation 2015-09-01 17:11:09 -07:00
Shivam Dave
8a5c61e2e6 Merge remote-tracking branch 'upstream/master' into mobile 2015-09-01 14:50:45 -07:00
Victor Woeltjen
01f2fab70f [Create] Filter out control-less properties 
When properties have no control defined, don't show them
in the create dialog (but do show them in metadata, e.g.
info bubble.) For nasa/openmctweb#92
 2015-09-01 11:48:15 -07:00
Victor Woeltjen
b39753d0a6 [Entanglement] Separate out location 
Separate out location property from the CreationService,
instead handle in the entanglement bundle; this is
consistent with changes for identity management (attaching
a creator to newly-created domain object models).
for nasa/openmctweb#92
 2015-09-01 10:57:56 -07:00
Victor Woeltjen
e3eda5112c [Identity] Expose creation service as provider 
Expose creation service as a provider of a composite service;
this allows it to be decorated by the identity bundle to
attach a creator, for nasa/openmct#92
 2015-09-01 10:41:27 -07:00
Charles Hacskaylo
2cbe686732 [Frontend] IN-PROGRESS Refactoring to cleanup SASS file structure 
open #95
Moved styles from initialization.scss to user-environ/_layout;
forms.scss, items.scss, tree.scss includes moved into main.scss;

Removed forms.css, items.css, tree.css,
Removed initialization.scss, tree.scss
 2015-08-31 14:11:42 -07:00
Shivam Dave
021d105fd0 Merge remote-tracking branch 'upstream/open95' into mobile 2015-08-31 13:37:43 -07:00
Shivam Dave
7ffbc9ad2f [Remove Action] Check 
Added check for traverseObject
context because prior to this,
was not checked.
 2015-08-31 13:37:22 -07:00
Charles Hacskaylo
90f62b92a5 [Frontend] Super-minor cleanups in .scss files 
open #93
 2015-08-31 12:54:52 -07:00
Charles Hacskaylo
5a991076ea [Frontend] CSS and markup tweaks to enable flex layout 
open #93
Layout frame and imagery markup modified;
 2015-08-31 12:34:34 -07:00
Charles Hacskaylo
54bf39344a [Mobile] Multiple mobile Safari fixes 
open #74
New mixins to prefix '-webkit-' to props and vals;
'flex' classes use new webkit mixins;
Fixed flex layout of .object-browse-bar and
.context-available element;
Migrated CSS to remove small .scss include files;
 2015-08-27 17:05:50 -07:00
Charles Hacskaylo
683b3f7511 Merge remote-tracking branch 'github/mobile' into open74-m-master 2015-08-27 12:56:47 -07:00
Shivam Dave
510e7d1261 [Mobile] Merge 
Merged with master, getting the
RemoveAction changes.
 2015-08-27 12:15:48 -07:00
Charles Hacskaylo
80a91970f6 Merge remote-tracking branch 'github/mobile' into open74-m-mobile 2015-08-27 11:34:14 -07:00