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

2024 Commits

Author SHA1 Message Date
Charles Hacskaylo
ad4292f1e9 [Frontend] Mods to DialogService model and dialogs 
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;
 2015-10-07 11:45:08 -07:00
Charles Hacskaylo
6840e596a5 [Frontend] Adding progress-bar.html template 
open #159
open #170
 2015-10-07 10:25:47 -07:00
Charles Hacskaylo
30fd8c451e [Frontend] Progress bar as include; progress dialog 
open #163
open #170
Progress bar now mct-include;
Progress dialog sanded;
Dialog launcher modded;
 2015-10-06 16:10:27 -07:00
Henry
bf0014f1b9 Temporary commit 2015-10-06 14:45:10 -07:00
Charles Hacskaylo
2aeebff652 Merging in Andrew's work so far on progress and blocking dialogs 
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
 2015-10-06 14:41:58 -07:00
Charles Hacskaylo
471a25a625 [Frontend] Progress bar/ message banner markup and styling 
open #170
Major work on progress bar;
 2015-10-06 14:34:53 -07:00
Charles Hacskaylo
d606ee421f [Frontend] New template for message-banner 
open #159
open #170
Added markup and beginning of styling;
Temporarily added mct-include elem to bottombar.html;
 2015-10-02 18:37:01 -07:00
Charles Hacskaylo
926aed72c3 [Frontend] Style and display changes to status block 
open #159
open #170
Refined structure in status block markup and css;
Added status-related color constants to theme scss files;
 2015-10-02 17:42:31 -07:00
Charles Hacskaylo
7014808c13 [Frontend] Style and display changes to status block 
open #159
open #170
Moved classes from _bottom-bar.scss into _layout.scss
and new file _messages.scss;
Removed  _bottom-bar.scss;
Revised display behavior of .status.block to show label on
hover;
 2015-10-02 15:41:02 -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
056b0c8c5b [Fixed Position] Use spaces instead of tabs 
...to satisfy code style checker and pass build,
in preparation for merge. nasa/openmctweb#118
 2015-09-23 12:59:04 -07:00
Victor Woeltjen
fa60d62039 [Entanglement] Simplify test case 
...per review feedback from nasa/openmctweb#98
 2015-09-23 12:49:04 -07:00
Victor Woeltjen
082122ddec [Entanglement] Move policyService.allow.andReturn 
...to locations where the specified return value
can be more closely correlated to the relevant
test cases. nasa/openmctweb#98
 2015-09-23 12:46:23 -07:00
Victor Woeltjen
6dbccd5000 [Entanglement] Update test cases around error-throwing 
...per code review feedback, nasa/openmctweb#97
 2015-09-23 12:43:03 -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
Victor Woeltjen
97892869ae [Entanglement] Move composition check up 
Move check for composition up higher in the sequence of
if-blocks in the validation step of linking; remove
fallback to [] for undefined composition, which is no
longer necessary as a consequence of this.

nasa/openmctweb#98
 2015-09-22 15:53:27 -07:00
Victor Woeltjen
8db334e45b Revert "[LinkService] Reorder/refactor validation" 
This reverts commit c17269ba8b.
 2015-09-22 15:51:15 -07:00
Victor Woeltjen
4743833f7c [Entanglement] Verify revalidation 
Verify that move/copy/link revalidate when performed and
throw errors when moving/copying/linking would be invalid.
nasa/openmctweb#98
 2015-09-22 15:49:22 -07:00
Victor Woeltjen
6996883b85 [Entanglement] Update specs 
Update specs for move/copy/link services to account
for re-validation at time an action is performed.
nasa/openmctweb#98
 2015-09-22 15:42:39 -07:00
Victor Woeltjen
119403e71c [Entanglement] Throw errors if validation is skipped 
...per feedback from nasa/openmctweb#98
 2015-09-22 14:39:15 -07:00
Victor Woeltjen
ff24f06475 [Entanglement] Add JSDoc 
...per feedback from nasa/openmctweb#98
 2015-09-22 14:10:06 -07:00
Victor Woeltjen
597b18af1c [LinkService] Amend test cases 
Remove redundant test case; modify composition-checking
test case to expose correct capability information.
In response to feedback from nasa/openmctweb#98
 2015-09-22 14:07:46 -07:00
Pete Richards
aba0969312 Merge branch 'mobile-integration' into open-master 2015-09-22 13:53:22 -07:00
Victor Woeltjen
b4a2bfd727 [LinkService] Change variable name 
...based on feedback from nasa/openmctweb#98
 2015-09-22 13:50:10 -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
55362f6b26 [LinkService] Clarify comment 
Clarify comment, based on feedback from nasa/openmctweb#98
 2015-09-22 13:48:11 -07:00
Pete Richards
8611926533 Merge remote-tracking branch 'github-open/open113' into open-master 2015-09-22 13:45:04 -07:00
Victor Woeltjen
c17269ba8b [LinkService] Reorder/refactor validation 
Reoder validation to consider the composition capability
first; refactor to express as a single expression to clarify
validation logic (explicitly say 'and' instead of implying
it with control flow.)

Based on feedback from nasa/openmctweb#98
 2015-09-22 13:37:56 -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
Pete Richards
480da3476e Merge branch 'mobile' into mobile-integration 2015-09-22 10:55:43 -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
b163b45a5e [Framework] Update spec 
Update spec to verify that app.controller et al
are not called multiple times with the same key.
 2015-09-18 15:10:21 -07:00
Victor Woeltjen
d236fd10c3 [Framework] Move registration-tracking 
Move registration-tracking for Angular built-ins such that
these are correctly tracked at the instance level.
 2015-09-18 15:02:32 -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
Charles Hacskaylo
65368ed0c3 [Config] Removed non-functional config options from Create dialogs; 
open #124
Removed "Default view" and "Display title by default" from
Panel configs;
 2015-09-18 13:43:29 -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
158fbf5365 [Mobile] Check orientation dynamically 
Check orientation dynamically from the AgentService
(more specifically, recheck when called - this may
change as a user rotates a device.)
 2015-09-18 09:15:08 -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
733a282f3f [Framework] Obey priority order for controllers et al 
Support overriding of controllers between bundles.
 2015-09-17 17:51:06 -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
411a4ebfbf Merge remote-tracking branch 'github/master' into mobile 2015-09-17 16:41:13 -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
Victor Woeltjen
ac48039b90 [Mobile] Create empty bundle for mobile 2015-09-17 16:40:18 -07:00
Victor Woeltjen
411f0d904d [Entanglement] Test LocatingObjectDecorator 2015-09-17 14:45:05 -07:00
Victor Woeltjen
d92ae4d508 [Core] Add tests for 'contextualize' 2015-09-17 14:06:22 -07:00
Victor Woeltjen
bc4c7feb6c [Core] Update spec for CompositionCapability 
...to reflect changes to separate out contextualization
of domain objects
 2015-09-17 13:57:20 -07:00
Victor Woeltjen
c4aed57165 [Entanglement] Refactor LocatingObjectDecorator 
Rearrange code in LocatingObjectDecorator to make it easier to
follow; add comments.
 2015-09-17 13:51:50 -07:00
Victor Woeltjen
88b8528aaf [Entanglement] Log a warning on cycle detection 
nasa/openmctweb#84
 2015-09-17 13:42:08 -07:00
Victor Woeltjen
d1c0d81120 [Entanglement] Contextualize objects by location 
Add a context capability to domain objects based
on their location at the time they are loaded.
nasa/openmctweb#84
 2015-09-17 13:37:57 -07:00
Victor Woeltjen
a233856bac [Core] Separate out contextualize 
Separate out contextualize function to facilitate
reuse from entanglement bundle. nasa/openmctweb#84
 2015-09-17 13:15:42 -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
acdd35cf65 [Forms] Fix select control 
Use ng-show instead of ng-if to suppress the
'Select One' option after user has chosen something
in a select box; the latter appears to be incompatible
with Angular 1.4.x. nasa/openmct#113
 2015-09-16 12:23:26 -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
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
Pete Richards
8c1b70f085 Merge remote-tracking branch 'github-open/open53' into open-master 2015-09-14 11:00:56 -07:00
Pete Richards
c010011798 Merge remote-tracking branch 'github-open/open1252' into open-master 2015-09-14 10:51:30 -07:00
Victor Woeltjen
ecf7f4b235 [Info Bubble] Remove ID 
Don't show domain object id in info bubble; this is not
useful information to non-developers. (For developers,
this information can be retrieved from the URL by
navigating to a domain object.) WTD-1252
 2015-09-11 16:29:20 -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
01045e6ee1 [Persistence] Add local storage indicator 2015-09-11 14:48:17 -07:00
Victor Woeltjen
febb0edede [Persistence] Add spec for local storage persistence 2015-09-11 14:31:57 -07:00
Victor Woeltjen
048eb20450 [Persistence] Update code style 
Update code style for local storage based persistence.
 2015-09-11 14:05:01 -07:00
Victor Woeltjen
215b4a154b [Persistence] Move local storage to platform 
#79
 2015-09-11 13:53:47 -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
Victor Woeltjen
f17410a85b [Capabilities] Avoid erroneous logging 
Fix logic error which caused an inaccurate warning to
be logged when capabilities are overridden by priority.
Addresses #49.
 2015-09-11 11:38:22 -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
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
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