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
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
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
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
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
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
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
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
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
Shivam Dave
f0c64b6b92
[Browse] Back Arrow
...
Refactored Back Arrow to work same as prior
commit, however with less if else statements.
Returns if not at root, otherwise root is set to
true.
2015-08-27 10:45:48 -07:00
Shivam Dave
48136c2265
[Context] Back Arrow
...
Checks the Back Arrow in both checkRoot and
navigateToParent, also checks grandparent in both.
This allows the back arrow to hide in search when
context is unavailable.
2015-08-27 10:42:11 -07:00
Charles Hacskaylo
1961adf8d6
[Mobile] Fixed font-size and line-height problem in tree
...
open #74
2015-08-27 10:33:32 -07:00
Victor Woeltjen
5230bdfc6b
Merge pull request #86 from nasa/open51
...
Addresses nasa/openmct#51
2015-08-27 10:02:24 -07:00
Shivam Dave
687d86790e
[Action] RemoveAction
...
Added comments regarding change in
checking of traversed objects.
2015-08-27 09:49:26 -07:00
Shivam Dave
3ec4cc099b
[Action] RemoveAction
...
Adjusted unit tests for checking if
traverseObject is undefined. Also removed
unnecessary ROOT_ID variable.
2015-08-27 09:41:00 -07:00
Shivam Dave
dadbf3f6dc
[Action] RemoveAction
...
Checks if the object exists, instead of
checking if the ROOT is specifically reached,
when traversing up to ancestors.
2015-08-27 09:17:11 -07:00
Shivam Dave
8c4c65241a
[Mobile] Tree
...
WHen selecting a leaf node on phone-portrait,
now the left menu will close if you select the
object name or the arrow.
2015-08-27 09:02:55 -07:00
Shivam Dave
67cb5f8077
[Mobile] Tests
...
Completed test for the BrowseController
Spec that takes in an undefined context.
2015-08-26 21:08:33 -07:00
Shivam Dave
bb2f086623
[Mobile] Leaf Node of Folder/Layout
...
Domainobjects that can hold an array of
domain objects return '[]' instead of
undefined, when checking for model.composition.
Now checks for empty array and navigates to layout/
folder that has no children.
2015-08-26 20:21:36 -07:00
Shivam Dave
a0169ad158
[Mobile] Browse Controller
...
Adjusted BrowseController to hide the
back button if current object represented/
selected has no context.
2015-08-26 20:20:16 -07:00