ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-27 16:38:51 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
3,863 Commits 989 Branches 212 Tags 191 MiB
2fe7ba982f
Commit Graph

1557 Commits

Author SHA1 Message Date
Henry
fdfb524eef Fixed scope of editMode variable 2015-10-21 12:06:11 -07:00
Henry
ef250f58de Marged style updates 2015-10-21 12:01:59 -07:00
Henry
15ed91f651 Added save buttons 2015-10-21 11:54:35 -07:00
Charles Hacskaylo
074254a513 Frontend] Styling for New Edit Mode 
open #198
Minor tweak to placeholder init content;
 2015-10-21 11:38:03 -07:00
Charles Hacskaylo
4c84789d5d Frontend] Styling for New Edit Mode 
open #198
.l-flex styles refined;
Animation refinement;
.s-btn default vertical-align = top;
.tool-bar style tweaked;
Added title-label back into edit-action-buttons.html;
 2015-10-21 11:35:36 -07:00
Andrew Henry
92573b817f Added drag to enable edit mode 2015-10-20 21:03:36 -07:00
Charles Hacskaylo
5382cca435 [Frontend] Styling for New Edit Mode 
open #198
In-progress styling of toolbar elements;
Revamped edit-action-buttons.html to use only icons;
 2015-10-20 15:43:53 -07:00
Charles Hacskaylo
15c1bf20ab [Frontend] Styling for New Edit Mode 
open #198
Refined CSS classing and animation timing;
 2015-10-20 14:41:02 -07:00
Charles Hacskaylo
685dd2114d [Frontend] Styling for New Edit Mode 
open #198
Added Save and Cancel buttons;
Additional transition styling;
tool-bar styles refined;
 2015-10-20 14:11:59 -07:00
Charles Hacskaylo
6e30a25a6f [Frontend] Added new glyph 
prod-uisymbols
Added e612 Save icon;
 2015-10-20 12:44:09 -07:00
Charles Hacskaylo
be79c104fb [Frontend] Added new glyph 
prod-uisymbols
Added e612 Save icon;
 2015-10-20 12:36:11 -07:00
Charles Hacskaylo
42fa5bfd7e [Frontend] Initial styles for New Edit Mode 
open #198
Refactored elems in browse-object.html to use
flex layout;
New flex-row and flex-col general CSS classes;
New pulseBorder animation mixin;
 2015-10-20 11:39:28 -07:00
Charles Hacskaylo
fb0ce1eca8 [Frontend] New .loading class 
open #190
Removed old .loading styles previously
commented out;
 2015-10-19 11:13:50 -07:00
Charles Hacskaylo
d7bd793bf3 [Frontend] New .loading class 
open #190
CSS for revised .loading class;
Commented out/removed old .loading styles;
Theme constants for loading colors added
to theme files;
 2015-10-15 16:23:42 -07:00
Charles Hacskaylo
821a1a485c [Production] Updated symbols font to v25 
open #188
Added icon-dataset e611;
 2015-10-14 16:45:55 -07:00
Henry
f08725b6a2 Fixed jshint errors 2015-10-14 16:22:11 -07:00
Henry
301b73c6c6 Banner notifications are not maximized if 'info' message 2015-10-14 16:22:10 -07:00
Henry
912e70d219 Fixed failing tests, and added stopPropagation to prevent maximizing of notifications on action click or dismiss 2015-10-14 16:22:10 -07:00
Henry
1d41939418 Fixed failing tests 2015-10-14 16:22:10 -07:00
Henry
ee382be38d Added transitions and severity classes 2015-10-14 16:22:10 -07:00
Charles Hacskaylo
34ea3ad9bb [Frontend] Banner message animations; class renaming 
open #163
open #170
Added transition animations to message banners;
Renamed $colorStatus* class names to map more
closely to severity constants;
 2015-10-14 16:22:10 -07:00
Henry
2ba6f18c59 Making changes to implement display queue 2015-10-14 16:22:10 -07:00
Henry
b2a09599a0 Modified messages dialog launcher 2015-10-14 16:22:10 -07:00
Henry
11264759ec Added highest severity calculation in NotifiationService 2015-10-14 16:22:10 -07:00
Andrew Henry
c0ff6de27b Added notification indicator 2015-10-14 16:22:10 -07:00
Henry
60dda8a7a4 Updated 2015-10-14 16:21:54 -07:00
Charles Hacskaylo
9cc0c0b06f [Frontend] Polishing of styles for time-controller 
open #179
open #180
Font-size normalized for time-controller and domain selector;
Layout of object-holder and time-controller fixed;
 2015-10-14 10:25:05 -07:00
Henry
82ae9e72c1 Integrated notifications list 2015-10-09 14:17:55 -07:00
Pete Richards
8c29c8ed0e Merge remote-tracking branch 'github-open/open151' into open-master 2015-10-09 13:38:20 -07:00
Henry
85300d3743 Refactored DialogService a little 2015-10-09 11:57:47 -07:00
Henry
fe3e3325e1 Merge branch 'open170' into open155 2015-10-09 11:00:09 -07:00
Henry
2b97d61d6c Further integration work 2015-10-09 10:59:36 -07:00
Victor Woeltjen
756f728865 Merge remote-tracking branch 'github/open1515' into open-master 2015-10-09 10:11:11 -07:00
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
Charles Hacskaylo
954fdd5906 [Frontend] Sanding/positioning and Cancel button added to Messasges dialog 
open #159
open #170
Added Cancel button to Messages dialog in DialogService.js;
Important tweaks to layout of messages to allow
bottom-bar to align to bottom in singleton dialog view;
Revised status colors in theme's constants files;
 2015-10-08 19:10:26 -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
Henry
8267058487 Begun integration of Notifications framework with Charles' code 2015-10-08 15:08:26 -07:00
Henry
4a913376ac Merge branch 'open170' into open155 2015-10-08 13:57:25 -07:00
Henry
5ff3c71523 Fixed the Banner Controller which was not returning reference to controller 2015-10-08 13:56:59 -07:00
Henry
ba614fe2d6 Trying to sort out error 2015-10-08 13:46:42 -07:00
Henry
5e713f279b Moved some more vars 2015-10-08 13:18:47 -07:00
Henry
df590107cb Moved some more vars 2015-10-08 13:17:12 -07:00
Henry
fc8630dbc6 Moved some vars 2015-10-08 13:15:31 -07:00
Henry
12a94f828a Added some more semicolons 2015-10-08 13:14:30 -07:00
Charles Hacskaylo
0e840ae003 [Frontend] Messages major work 
open #159
open #170
CSS, markup and JS test files initially complete;
Templates renamed for consistency;
message-type icons styled;
Added severity constant "alert";
TO-DO: check refactored CSS against mobile,
see what's broken;
 2015-10-08 13:09:41 -07:00
Henry
e1e5919f68 Added some semicolons 2015-10-08 13:08:43 -07:00
Henry
b2cd66bd5d Merged in charles' changes 2015-10-08 11:26:31 -07:00
Henry
af1fa6e77a added semicolons to test spec 2015-10-08 11:13:32 -07:00
Henry
5ff90f7254 Added more tests, some refactoring 2015-10-08 11:03:48 -07:00
Charles Hacskaylo
0ca9e5c952 [Frontend] Message list initially working 
open #159
open #170
Thank you @akhenry;
launchMessages function added to DialogLaunchController.js;
New message-list.html template;
message.html is now its own include;
blocking-message.html renamed to
overlay-blocking-message.html;
 2015-10-08 09:37:43 -07:00
Charles Hacskaylo
8ee93d9603 [Frontend] Tweaks to dialog-launch; added ui-symbols 
open #159
open #170
 2015-10-07 18:26:11 -07:00
Charles Hacskaylo
ac59df9595 [Frontend] Added type-icon to message dialogs 
open #159
open #170
Percent complete added to progress-bar.html;
Refined overlay height;
 2015-10-07 17:56:25 -07:00
Charles Hacskaylo
182eff977c [Frontend] Dialog and overlay layout/positioning mods 
open #159
open #170
Restructured overlay size and positioning approach
for better flexibility;
Getting new dialogs and the overlay to
play nicely in mobile context;
 2015-10-07 16:36:55 -07:00
Henry
3af23b7bc5 Added test cases for notification service 2015-10-07 14:30:19 -07:00
Charles Hacskaylo
7f529eec68 [Frontend] Mods to OverlayService 
open #159
open #170
OverlayService can now be passed typeClass,
which is added to the CSS class of the overlay's
mct-include tag - intent is to allow the overlay
to size itself based on the type of content to be
displayed;
 2015-10-07 12:11:30 -07:00
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
Victor Woeltjen
1ca2b769d9 [Common UI] Test popupService 2015-10-02 15:44:36 -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
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
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
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
Charles Hacskaylo
6e172359b4 [Mobile] IN PROGRESS: Significant re-org of search results styling 
open #74
Removed all styles for search-result-item
in search/_search.scss and significantly re-orged .tree-item in
_tree.scss and mobile/_tree.scss to control
search-result-item styles;
 2015-08-26 18:15:29 -07:00
Charles Hacskaylo
d33678276c [Mobile] IN PROGRESS: Re-orgs after merge of Shivam's mobile branch 
open #74
Re-applied changes to browse.html;
Added mobile/.../_search.scss;
Removed unused mobile/search/layout.scss;
Moved inclusion of search/_search.scss from tree.scss to main.scss;
 2015-08-26 17:49:40 -07:00
Charles Hacskaylo
1cbca41c53 Merge remote-tracking branch 'github/mobile' into open74-merge-mobile 2015-08-26 16:55:15 -07:00
Charles Hacskaylo
a27083c28c [Mobile] IN PROGRESS: tweaked padding in form-row 
open #74
 2015-08-26 16:54:13 -07:00
Shivam Dave
def5e17bb8 [Mobile] Merge 
Merged open73 into mobile. Search bar is currently
covering the create button slightly.
 2015-08-26 14:07:52 -07:00
slhale
2cd1907b71 [Search] Temporarily hide link icons 
Hide link icons in search results to temporarily
fix issue #84.
 2015-08-26 13:40:28 -07:00
Charles Hacskaylo
b8b9721ddc [Mobile] IN PROGRESS: Hide name in view-switcher in mobile 
open #74
 2015-08-26 13:04:09 -07:00
Charles Hacskaylo
f80266b23f [Mobile] IN PROGRESS: Styling in forms, overlay and tree 
open #74
.section-header and form-row styles changed in forms/_elems.scss;
significant changes to overlay in mobile: full-screen, close button, more;
tree hover bg changed to use rgba(#fff, 0.1);
removed "Hide title by default" in core/bundle.json;
 2015-08-26 12:34:45 -07:00
Charles Hacskaylo
9a3009f327 [Mobile] IN PROGRESS: Styling on Create menu 
open #74
 2015-08-26 10:50:14 -07:00
Shivam Dave
2542255342 [Mobile] AgentService call 
window referred to in TreeNodeController added as
keyword to skip in top comment.
 2015-08-26 10:16:22 -07:00
Shivam Dave
e7563ff4e9 [Action] Merge 
Merged with master.
 2015-08-26 10:11:23 -07:00
Charles Hacskaylo
89bfa54563 [Mobile] IN PROGRESS: Misc layout tweaks; treeview pane styling 
open #74
Treeview pane darkened;
Spacing in frame tweaked;
#content-area in right pane hidden
when treeview expanded for
phone portrait only;
Removed mobile-pane and
desktop-browse classes from markup;
 2015-08-26 10:08:57 -07:00
Shivam Dave
a507557cec [Remove] Remove Action 
Tweaked remove action to return
on finding the object that is being removed and
checking if it can be navigated to. Also completed
tests for RemoveAction.
 2015-08-26 10:07:51 -07:00
Shivam Dave
793c99ac2f [Remove] Tests 
RemoveActionSpec test complete, tests if
parent is object is removed. Also tests if
object not in object path is removed.
 2015-08-26 10:02:16 -07:00
Charles Hacskaylo
39bd292886 [Mobile] IN PROGRESS: Overlay and form cleanups 
open #74
Widths and layout strategy fixed for label and
controls in form when appearing in mobile;
Overlay margins adjusted;
Cleaned up font size, line-height in tree items;
 2015-08-26 09:43:51 -07:00
Shivam Dave
e8bc9ecc1a [Search, Mobile] Merge 
Merged search/master into mobile. Adjusted the
search bar to work on branch and fit accordingly.
 2015-08-25 15:27:21 -07:00
Shivam Dave
0fa330adff [Mobile] Tests 
Adjusted TreeNodeControllerSpec to
test setObject prototype.
 2015-08-25 14:49:38 -07:00
Shivam Dave
9cd57614e4 [Mobile] AgentService & Tests 
Adjusted the getOrientation of agentService to
inject the window instead of calling for it in
agentService. Also adjusted treeNodeController
for this. Added tests for the agentService's
getOrientation function.
 2015-08-25 14:33:48 -07:00
Shivam Dave
d80c359a86 [Mobile] Tests 
Fixed BrowseControllerSpec test
to account for new  call. Now
expects destroy and select-obj calls.
 2015-08-25 14:20:36 -07:00
Charles Hacskaylo
07d0706cd1 [Mobile] IN PROGRESS: 
open #74
Added name for "base" (unknown) type in core/bundle.json;
Fixes to grid-item .details element:
- ellipsize,
- type now displayed properly;
- number of items with correct plural syntax;
 2015-08-25 14:17:34 -07:00
Charles Hacskaylo
fd5a911d50 [Mobile] IN PROGRESS: Fixed object-browse-bar flex 
open #74
Also set left position of .object-browse-bar;
 2015-08-25 13:51:02 -07:00
Charles Hacskaylo
c71f1fe447 [Mobile] IN PROGRESS: Significant refactor in mobile/_layout.scss 
open #74
Made view-switcher visible when browsing via mobile;
Fixed class in browse.html markup from left-menu to left;
Moved object-browse-bar, top-bar classes from _controls into _layout;
Renamed and simplified menu widths in mobile _constants;
Really significant refactor of mobiles/_layout;
Tweaks in user-environ/_layout;
TO-DO: figure out why object-browse-bar flex styles not
working in mobile;
 2015-08-25 13:34:37 -07:00
Shivam Dave
cd46dab5c1 [Mobile] Merge 
Merged with master and resolved conflicts.
 2015-08-25 12:36:50 -07:00
Charles Hacskaylo
e1858bf0ae [Mobile] IN PROGRESS: Moved position of view-switcher 
open #74
view-switcher in object browse and edit moved to precede
action buttons, with margin;
Re-located CSS for .btn, etc. from _controls.scss to _layout.scss;
Cleaned up line-spacing in object-header in .frame;
 2015-08-25 10:15:14 -07:00
Charles Hacskaylo
7542c6d49a [Mobile] IN PROGRESS: Cleanups on .btn for line-height, sizing, etc. 
open #74
 2015-08-25 09:41:38 -07:00
slhale
6571da922d [Search] Update style for link icons 
Added styling to correctly position and color
link icons within the search resutls list.
 2015-08-25 08:56:32 -07:00
Charles Hacskaylo
13b66cd215 [Mobile] IN PROGRESS: Only display custom scrollbars in desktop mode 
open #74
 2015-08-24 17:04:38 -07:00
Shivam Dave
aca06c6007 [Action] Remove Action Merged 
Remove Action merged to allow removal of
parent or current selected object, then
navigation to lowest existing parent if
currently located in deleted object.
 2015-08-24 16:46:48 -07:00
Charles Hacskaylo
69c6d4bd26 [Mobile] IN PROGRESS: Tweaks to labels; 
open #74
Cleaned up layout of bottom-bar;
Fixed class selector for ue-bottom-bar;
 2015-08-24 16:31:38 -07:00
Shivam Dave
6a2bdd103b [Mobile] Hide Tree 
On selecting a node in the tree, if the
user is on phone and in portrait, than
emit up to the browse controller to call
treeSlide(), which will hide the tree menu.
Also adjusted the agent service to properly
check for orientation using window.innerHeight/
Width. Also created function for the selection
of an object in BrowseController.
 2015-08-24 16:17:58 -07:00
Charles Hacskaylo
76c4b96683 [Mobile] IN PROGRESS: Menu hide/show fixes; font-size tweaking 
open #74
Changed .right-repr to use translateX in phone portrait mode;
font-size tweaking;
Refactored css organization in mobile/_layout.scss;
 2015-08-24 15:24:35 -07:00
slhale
c81e2dbb4a Merge branch 'master' of https://github.com/nasa/openmctweb into search 
Conflicts:
	platform/commonUI/general/src/controllers/TreeNodeController.js
	platform/persistence/elastic/src/ElasticSearchProvider.js
 2015-08-24 13:14:43 -07:00
Charles Hacskaylo
44ed4e0e0d [Mobile] IN PROGRESS: Minor tweak for line-height in top-bar 
open #74
 2015-08-24 12:39:50 -07:00
Charles Hacskaylo
e96d3e3738 [Mobile] IN PROGRESS: Significant redo of object-header 
open #74
Added .bar .l-flex using display: flex in object header;
 2015-08-24 12:22:08 -07:00
Pete Richards
9eb23a62bc Merge branch 'open75' into open-master 2015-08-24 10:42:19 -07:00
Pete Richards
9b6a839c06 Merge branch 'open-jpl48' into open-master 2015-08-24 10:39:17 -07:00
Charles Hacskaylo
039d692e4c Forgot to add new .scss file 
open #74
 2015-08-21 15:10:19 -07:00
Charles Hacskaylo
ee608cc4a4 [Mobile] IN PROGRESS: General fixes, spurred by mobile, for object-header 
open #74
Attempting to layout using flex - not working;
See http://jsfiddle.net/charlesh88/cpf9zjts/9/ for working example;
New _flex.scss added;
This commit is changed elements that are mostly solid;
 2015-08-21 15:09:23 -07:00
Shivam Dave
d0183d44c9 [Actions] Remove Action 
When an ascendant or parent or currently
selected object is removed the user is navigated
to the parent of the object being removed. Added variables
to RemoveAction test to test removing currently selected
domainObject.
 2015-08-21 13:04:47 -07:00
Charles Hacskaylo
da8eb334e3 [Mobile] Sanding of mobile styles continues, in progress 
open #74
CSS and markup changes for split pane holders;
drop shadow added to tree area;
Tree item cleanups;
This or earlier commit broke treeview nav action;
TO-DO: fix treeview nav action to hide menu;
 2015-08-20 18:36:44 -07:00
Charles Hacskaylo
67592def90 [Mobile] Sanding of mobile styles, in progress 
open #74
CSS and markup changes for mobile,
particularly on grid-item;
Mod to behavior in tree for mobile nav:
leaf node grid-item click now navs to item;
Fixed info-button to work properly with mod to
infoButtonGesture.js;
 2015-08-20 16:11:45 -07:00
Charles Hacskaylo
3484b315cf [Mobile] Sanding of mobile styles, cherry-pick to master 
open #74
CSS and markup changes for mobile
that are good for master now;
 2015-08-20 16:09:35 -07:00
Charles Hacskaylo
b1e1e85bbd Merging in latest openmctweb master 
open74
Had to resolve conflicts
 2015-08-20 10:36:41 -07:00
Charles Hacskaylo
249a9b2eb2 [Frontend] Better sorting indicators added to styles 
JPL #48
Simplified styles to indicate sort by asc and desc in table th elements;
(cherry picked from commit 15a2416)
 2015-08-19 18:17:15 -07:00
Charles Hacskaylo
02abbdf4fe Resolving conflict in platform/.../theme-espresso.css 
#75
Merged in master branch;
Re-rendered platform/.../theme-espresso.css;
 2015-08-19 16:22:21 -07:00
Charles Hacskaylo
08d68f99a5 [Frontend] Fix word wrapping issues in hover bubble 
#75
CSS modified to utilize word-break property;
 2015-08-19 16:09:55 -07:00
Victor Woeltjen
f27e4d6e06 Merge branch 'open-master' into open1482c 
Merge in latest in preparation to merge; WTD-1482

Conflicts:
	platform/commonUI/browse/src/creation/CreationService.js
	platform/core/src/models/RootModelProvider.js
	platform/entanglement/src/services/LinkService.js
	platform/entanglement/src/services/MoveService.js
 2015-08-19 15:00:52 -07:00
Victor Woeltjen
a4a9acd2ea Merge branch 'open-master' into open-965 
Merge in latest into topic branch for WTD-965 to
resolve conflicts.

Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
 2015-08-19 14:16:56 -07:00
Shivam Dave
c4dd4f5c45 [Mobile] Merge 
Merged with master.
 2015-08-19 11:01:58 -07:00
slhale
432ec519b6 Merge branch 'search' into open70 
Conflicts:
	platform/commonUI/browse/res/templates/browse.html
 2015-08-19 10:05:38 -07:00
Charles Hacskaylo
7f65ba236c [Frontend] Tweaks to Load More results button 
#70
 2015-08-19 09:44:23 -07:00
Charles Hacskaylo
4e3e3653a3 [Frontend] Styling for search elements 
#70
Significant .scss and markup changes across search;
New symbols font (v2.2) char for clear icon;
To-do: style "load more" element;
 2015-08-18 19:51:47 -07:00
slhale
d3ea67fbd9 [Search] Templates vs representations 
Made the search and search-menu templates into
representations, to be more consistent.
 2015-08-18 16:54:36 -07:00
Charles Hacskaylo
e426e0e5ec Merging in latest from master 
#70
 2015-08-18 15:23:42 -07:00
Charles Hacskaylo
f4b87cf70d [Project source] Updated icomoon.io symbols font project file 2015-08-17 15:47:28 -07:00
Charles Hacskaylo
366ec3d516 [Frontend] Styles for tabular views and view sections 
Original issue: https://github.jpl.nasa.gov/MissionControl/vista/issues/30

New CSS and symbols to support tabular views;
Required by JPL branch vista30 (https://github.jpl.nasa.gov/MissionControl/vista/tree/vista30)
 2015-08-17 15:11:27 -07:00
slhale
e159b7a15d [Search] mct-control textfield breaks focus 
Set up bundle.json so that the search bar could
be a mct-control, but left the control itself
commented out because then CSS styling would not
work due to lack of access to parent elements.
 2015-08-17 11:47:40 -07:00
Victor Woeltjen
bf417a14e0 Merge remote-tracking branch 'origin/open-master' into open1482c 
Merge latest into topic branch for WTD-1482
 2015-08-17 11:01:39 -07:00
slhale
7b4934ec55 [Search] Shorter menu transition 2015-08-17 10:33:26 -07:00
slhale
5e3caf6252 [Search] Shorter menu transition 2015-08-14 16:35:14 -07:00
slhale
31337eaf4f [Search] Text clear size & hover 
The search bar clear button now gets
highlighted when hovered over, and the
click area is slightly larger.
 2015-08-14 15:38:02 -07:00
slhale
0f6287e715 [Search] Fix overflow 
Fixed the text positioning in the filter
options display so that the text does not
overflow the bottom.
 2015-08-14 15:22:53 -07:00
slhale
0cfd881510 [Search] Menu transition and highlights 
The search menu fades in and out when open
and closed. Hovering over 'ALL' in the
menu now highlights it.
 2015-08-14 15:05:54 -07:00
slhale
cc05c50769 [Search] Smaller checkbox size 
in the search menu.
 2015-08-14 14:11:26 -07:00
slhale
d6d16f8f1c [Search] Font and spacing 
Use em for filter options positioning. Cursor
as pointer for menu. Results list padding fix.
 2015-08-14 11:58:32 -07:00
slhale
bcea3832ed [Search] Search menu & display tweaks 
Clicking on names of options in the search
menu will now toggle the checkboxes. The
filter options display now says when no
filters are selected. Slightly moved the
search menu to the left.
 2015-08-14 11:06:40 -07:00
slhale
94662cb904 [Search] Search filter options display style 
Created a box around the options display.
 2015-08-14 10:52:03 -07:00
slhale
26ab9af911 [Search] Dynamic positioning and height 
The scroll bar for the search results changes
height according to how many filter options
are displayed above it, without dissapearing
below the bottom of the page.
 2015-08-14 10:19:13 -07:00
slhale
c17ec19f97 [Search] Filter options display styling 2015-08-13 16:54:15 -07:00
slhale
2ca7a175bd [Search] Relative positioning 
Search results list now displays below the
filter options display dynamically.
 2015-08-13 16:40:51 -07:00
slhale
c62e73f863 [Search] Checkbox style 
Changed the checkboxes to be not blue.
 2015-08-13 16:06:10 -07:00
slhale
5726dd0e0c [Search] Filter display 
Added display below the search bar of what
search filters are currently active.
Not yet correctly aligned wrt search
results list.
 2015-08-13 15:11:22 -07:00
slhale
74cf4d73d5 [Search] Hover transitions 2015-08-13 14:22:07 -07:00
slhale
c8694f182a [Search] Menu opening 
Menu opens when icon is pressed. Closes when
cliked away from, but not when clicked on.
 2015-08-13 13:59:56 -07:00
slhale
2e767c94c4 [Search] Update load-more, add check-all 
Make the 'Load more' button work with the
new filtered results. Added 'ALL' to the top
of the search menu which allows the user to
toggle all of the filtering options easily.
 2015-08-13 13:19:25 -07:00
slhale
b26aa3cab7 [Search] Filter search 
Filtering search using the search menu works.
Load more does not work with this yet.
 2015-08-13 11:45:46 -07:00
slhale
c51856522c [Search] Menu checkboxes and labels 
Added checkboxes with styling to the menu. Set
up a types list for the menu.
 2015-08-13 10:59:12 -07:00
slhale
a9c85d5241 [Search] Search menu style 
Added caret to top of menu.
 2015-08-12 16:38:38 -07:00
slhale
edf52f32ad [Search] Search menu 
Creating a search menu which will allow for
more specific search options.
So far have started top-down with styling.
In progress.
 2015-08-12 16:13:36 -07:00
Victor Woeltjen
3492cd3942 [Code Style] Fix bug introduced by refactor 
Do some extra checking, since capabilities may have
properties which are note methods. WTD-1482.
 2015-08-12 13:57:17 -07:00
slhale
94531a39d0 Merge branch 'master' of https://github.com/nasa/openmctweb into searchservice 2015-08-12 13:17:17 -07:00
slhale
eefc746567 [Search] Fix results display 
Search results are now properly displayed again.
 2015-08-12 13:05:30 -07:00
slhale
0218bad9e8 [Search] Clear icon padding and transition 2015-08-12 12:58:22 -07:00
slhale
dd993c81a7 [Search] Clear icon working 
Clicking on the clear icon now clears
the input text in the search bar.
 2015-08-12 12:46:01 -07:00
slhale
a76e54483a [Search] Clear icon tweaks 
Comments and CSS. Still not clickable.
 2015-08-12 11:20:02 -07:00
slhale
3555f41f3e [Search] Adding clear text button 
It is in place, but clicking on it does nothing yet.
 2015-08-12 10:27:34 -07:00
slhale
9939c809be [Search] Adjust result list padding 2015-08-11 14:43:06 -07:00
slhale
89cb6867bd Merge branch 'master' of https://github.com/nasa/openmctweb into search 2015-08-11 14:32:39 -07:00
slhale
98801cb5d6 [Search] Remove unnecissary 2015-08-11 14:31:12 -07:00
slhale
23bc246a48 [Search] Search icon 
Search icon now is not visible when text is
entered in the search bar, even when the bar
is not in focus.
 2015-08-11 13:18:05 -07:00
Victor Woeltjen
c450c22ddd [Code Style] Satisfy JSLint 
Add missing semicolons etc. to satisfy JSLint after
changes for WTD-1482.
 2015-08-11 13:03:06 -07:00
Victor Woeltjen
aa08db1050 [Code Style] Avoid copying window/scope 
Avoids Angular errors; WTD-1482.
 2015-08-11 11:00:56 -07:00
slhale
a48a0820ad [Search] Search icon transition 2015-08-11 10:56:31 -07:00
slhale
7b471e5379 [Search] Search icon 
Moved the search icon to appear within the
text input area, and dissapears when the
input area is focused.
 2015-08-11 10:35:08 -07:00
Victor Woeltjen
de291ad3b1 [Code Style] Use prototypes in inspection bundle 
WTD-1482
 2015-08-11 10:00:56 -07:00
Victor Woeltjen
140d767026 [Code Style] Use prototypes in general UI bundle 
WTD-1482.
 2015-08-11 09:47:54 -07:00
Victor Woeltjen
be5cad212a [Code Style] Use prototypes in Edit bundle 
WTD-1482.
 2015-08-10 16:38:13 -07:00
Victor Woeltjen
efc42aa8f2 [Code Style] Use prototypes in Dialog bundle 
WTD-1482.
 2015-08-10 12:53:55 -07:00
Victor Woeltjen
f8a0ddb484 [Code Style] Avoid retaining reference to window 
Avoid https://docs.angularjs.org/error/ng/cpws
by changing way reference to  is retained.
WTD-1482.
 2015-08-10 12:39:56 -07:00
Victor Woeltjen
a77920bd18 [Code Style] Use prototypes in Browse bundle 
WTD-1482.
 2015-08-10 11:52:23 -07:00
Victor Woeltjen
78146d97f8 [Code Style] Use prototypes in About bundle 
WTD-1482.
 2015-08-10 10:19:02 -07:00
Victor Woeltjen
a7a1ac70e5 [JSDoc] Remove obsolete module references 
WTD-1482.
 2015-08-07 12:14:40 -07:00
Victor Woeltjen
31eb366e7f [JSDoc] Add namespace docs 
WTD-1482.
 2015-08-07 12:13:15 -07:00
Victor Woeltjen
eaaa1a19ca [JSDoc] Remove obsolete module references 
WTD-1482
 2015-08-07 11:55:38 -07:00
Victor Woeltjen
c08a460d30 [JSDoc] Add annotations 
Bulk-add JSDoc annotations, WTD-1482.
 2015-08-07 11:44:54 -07:00
slhale
7141c2818a [Search] Search icon near input 
Added a search icon next to the search bar
input.
 2015-08-06 16:59:09 -07:00
Pete Richards
48a9eef924 Merge branch 'open-master' into open-965 2015-08-06 16:13:37 -07:00
Pete Richards
c80e9bfa26 [Style] JSLint Compliance 2015-08-06 15:21:28 -07:00
Pete Richards
ec62c27f36 [Representations] grid-item and label display links 
grid-item and label representations now use the "location" capability
to determine whether or not to show a link indicator.
 2015-08-06 15:12:02 -07:00
Pete Richards
19b80ded16 Merge remote-tracking branch 'origin/open1423' into open-965 2015-08-06 15:10:52 -07:00
Pete Richards
f72f88adfa [Location] Use parent id as location 
Use the parent id as the location for a model.

This greatly reduces the recursive work that must be done
during move operations to keep the location accurate.

Additionally, the locationService now implements a method
`persistLocation` which can be used to persist the current object
location as it's original location.
 2015-08-06 15:05:47 -07:00
Pete Richards
449db4f3a9 [Templates] Add stubs for link indicator 
Update templates to use the location capability to show an indicator.
 2015-08-06 14:52:42 -07:00
Shivam Dave
63a99f26f6 Merge branch 'mobile_3' into mobile 2015-08-06 14:13:13 -07:00
Shivam Dave
7ca15a9de2 [Mobile] Representation 
Edited grid item to center
shared button.
 2015-08-06 14:11:59 -07:00
Shivam Dave
7ac1d2458a Merge remote-tracking branch 'origin/mobile_3' into mobile 2015-08-06 13:45:45 -07:00
Shivam Dave
0bc4f2dc6e Merge remote-tracking branch 'upstream/master' into mobile 2015-08-06 13:45:37 -07:00
Shivam Dave
dcd7d61c9a [Mobile] Tests 
Completed ContextMenu and InfoButton
Gesture tests where elements/body
touch events occur.
 2015-08-06 13:43:56 -07:00
Pete Richards
37cd73c6e8 [Template] Move ng-click to parent node 
Move the ng-click directive to the li element to match the element that receives
hover styles.

Fixes nasa/openmctweb#60.
 2015-08-05 17:11:30 -07:00
Shivam Dave
0a39984c4f [Mobile] Clean Up 
Fixed InfoService having 0 in
wrong spot. Also correctly compared
the UserAgent device to iPhone for
isMobile function in AgentService.
 2015-08-05 12:26:09 -07:00
Shivam Dave
0b635afcf7 [Mobile] Tests 
ContextMenu and InfoButton Gesture
tests remain.
 2015-08-05 12:14:16 -07:00
Shivam Dave
6b65ae77e7 [Mobile] Tests 
Completed tests for AgentService,
InfoService, and ContextMenuAction.
ContextMenu and InfoButton Gesture
tests remain. Also resized info button
icon.
 2015-08-04 16:48:41 -07:00
Shivam Dave
66408eeec8 [Mobile] Gestures 
Now to dismiss bubble, touch anywhere
the touch will not fire other gestures
(such as the pressing of another object).
 2015-08-04 13:41:48 -07:00
larkin
40e85b718d [Creation] Store location of new objects 
The creation service stores the location (the full path) to
the domain object as "model.location"
 2015-08-04 11:24:50 -07:00
slhale
ec87ac7652 [Search] Comments 2015-08-04 10:37:47 -07:00
slhale
8f65c73c8a [Search] Recompile CSS 
To make changes to the Sass reflected.
 2015-08-04 10:36:46 -07:00
slhale
35316dc31c [Search] Clean up 
Removed additional reference to searhc UI, as well
as correct persistence provider.
 2015-08-04 10:35:15 -07:00
slhale
b6bb689ccc [Search] Remove search UI files 
Leaving only search service related files.
 2015-08-04 10:31:52 -07:00
Shivam Dave
3d524d7572 [Mobile] AgentService 
Replaced name queryService with agentService.
 2015-08-04 10:11:25 -07:00
Shivam Dave
9b922913a0 [Mobile] Gestures 
Added styling to back and selection
arrow (tree). Also increased the space
allowed for selection arrow on tree item.
Info Button created on grid items for mobile.
Info bubble appears on tablet like desktop.
Also on mobile, info bubble fits to width.
New QueryService that returns if on iPhone.
Also formatted dialog box so that their is no
margin and takes up fullscreen on mobile.
 2015-08-04 09:59:08 -07:00
slhale
4439e1680d [Search] Update CSS 
Scrolling now does not move the search input
field. Load more text always stays on one line.
 2015-08-03 13:49:53 -07:00
slhale
5569ef8b2d Revert "[Search] Update CSS" 
This reverts commit e05f16d780.
 2015-08-03 13:39:22 -07:00
slhale
e05f16d780 [Search] Update CSS 
Slight tweak to the padding of the search view,
which affects where the top of the scroll bar
appears. Also removed the search scroll div
because it was unused.
 2015-08-03 13:26:29 -07:00
Shivam Dave
560a2e035e [Mobile] Info Button 
Added info button to grid/list items
on mobile. When the button is pressed,
info bubble appears for 750ms or the
same infobutton is pressed to dismiss
immediately.
 2015-07-31 11:13:52 -07:00
Shivam Dave
25e8bb44d2 [Mobile] Item Height 
Adjusted item height in
folder/layout list to be
automatically same as the
list object, not flowing over.
Applied to both phones and tablets.
 2015-07-30 14:10:43 -07:00
Shivam Dave
1624866656 [Mobile/Bug] RemoveAction 
When removing object you have
openned, now compares the currentObj
id with the removed obj id, resulting
in navigating to parent if they are the
same.
 2015-07-30 13:27:56 -07:00
Shivam Dave
2d1aa65d63 [Mobile] Test 
BrowseController test adjusted to
repeat less code.
 2015-07-30 12:50:39 -07:00
Shivam Dave
12ec293f3d [Mobile] Tests 
Changed BrowseController and RemoveActionSpec to account
for grandparent and navigation usage. Also changed
RemoveAction variable name.
 2015-07-29 13:57:11 -07:00
Shivam Dave
bdf8b4d3f1 [Mobile] Test for Back Arrow 
Added tests for the backarrow and
when it appears/disappears.
 2015-07-29 13:22:47 -07:00
Shivam Dave
6e60088b11 [Mobile] RemoveAction 
Removed console and added
navigationService (mock) to the
spec version.
 2015-07-29 11:58:53 -07:00
Shivam Dave
97bf530b1d [Mobile] BackArrow 
Removed the BackArrow console log
that was getting called in the
BrowseController.
 2015-07-29 11:41:10 -07:00
Shivam Dave
18348476c6 [Mobile] RemoveAction Tweak 
If you remove an object you are
currently within/opened, then on
removal of it you navigate to the
parent of whatever you removed.
 2015-07-29 11:38:47 -07:00
Shivam Dave
7e35e55f0b [Mobile] Hide Back Button 
When you are at the highest level the
back button fades out and is unclickable.
When you are able to go up a level the
back button appears/fades in and is
pressable. Also removed the object type
name from the header.
 2015-07-29 11:13:09 -07:00
Shivam Dave
28a2a5b92a [Mobile] Tweaks to layout 
Removed the user-select option
for the context menu and bottom bar
on mobile. Also edited the folder
grid item so that its icon rep
size is not overly large.
 2015-07-29 10:39:17 -07:00
Shivam Dave
d262520594 [Mobile] Tree menu Open 
Tree menu select arrow button's width
is now size of full button. Prior to this
the pressable area was less and therefore
less responsive.
 2015-07-29 10:25:09 -07:00
Shivam Dave
7cc14a195b [Mobile] Tests/Header 
Removes back arrow on desktops.
Also added queryService to tests
for the context menu action and
gesture.
 2015-07-29 10:00:03 -07:00
Shivam Dave
84b9e4d781 [Mobile] Context Menu 
Context menu next to object header
now dismisses when touching away
from it. Also, when long touching
an object, the context menu appears.
Set on 500ms timeout.
 2015-07-28 17:09:15 -07:00
Shivam Dave
356fa73c91 [Mobile] Tests 
Test created for backArrow
that spies on all objects
used to find parent.
 2015-07-28 15:55:22 -07:00
Shivam Dave
a073ef69ac [Mobile] Back Arrow 
Shifted Back Arrow down to
align with header.
 2015-07-28 15:15:42 -07:00
Shivam Dave
3c6c420023 [Mobile] Back Arrow 
Back Arrow implemented
by getting parent and then
navigating to it.
 2015-07-28 15:08:14 -07:00
slhale
32b58715c6 [Search] Fixed scrolling and layout edit 
Changed the CSS so that scrolling for the tree and
search results works again. Additionally, layout
editing works again.
 2015-07-28 12:33:22 -07:00
Shivam Dave
2a4943f584 [Mobile] Console 
Removed call to console so
mvn clean install would compile.
 2015-07-28 10:58:22 -07:00
Shivam Dave
e32403a75f [Mobile] Clean-Up 
Cleaned the unused code for the
backArrow and long touch gestures.
Commented out functions for later use
Currently shows the back arrow, however,
only will print to console on press.
Edited tests where mobile checks were breaking
and fixed.
 2015-07-28 10:56:29 -07:00
slhale
561d671181 [Search] Fix to pass test 
Changing TreeNodeController's isSelected function
back to original, so that it doesn't break tests.
 2015-07-28 09:50:50 -07:00
Shivam Dave
b0c42c12b7 [Mobile] Back Arrow 
Changes URL correctly that
is printed to the console. Is the
url to up one level of objects.
However not navigating to that
object.
 2015-07-27 17:01:30 -07:00
Shivam Dave
621ccc25ec [Mobile] Back Arrow HTML 
Created HTMl for back arrow,
next neew to hook up a click.
 2015-07-27 15:31:47 -07:00
Shivam Dave
6e43a92191 [Mobile] Merge 
Fix Conflicts.
 2015-07-27 15:21:59 -07:00
Shivam Dave
1d7a0fa48d [Mobile] Removed InfoGesture 
Commented out infogesture.
 2015-07-27 11:30:29 -07:00
Shivam Dave
3d0795cde3 [Mobile] Starting Context 
Added check to make sure
user is touching only one object.
Started contextmenugesture to be
long touch, however currently long
touch is still infogesture.
 2015-07-27 10:20:08 -07:00
Shivam Dave
c85a3787c0 [Mobile] User-Select 
Edited user-select used in
panes' layout to only
happen on phones and tablets
(just to be safe).
 2015-07-24 16:46:45 -07:00
Shivam Dave
066258ab83 [Mobile] User-Select 
Removes the copy/define
mobile safari menu that
appears during some touch events.
Only apply to left and right panes.
 2015-07-24 16:19:15 -07:00
Shivam Dave
ddc2295ec3 [Mobile] Touch Hold Gesture 
Rough touch hold gesture added
to the info gesture. Currently
if you hold on an item (that you
would normally hover over) for
500ms, you get the info gesture pop
up.
 2015-07-24 16:02:06 -07:00
Shivam Dave
011e6fc512 [Mobile] Clean Up 
Moved Mobile check in InfoGesture to
call on mouseEnter.
 2015-07-24 15:27:33 -07:00
shale
6b02295bf4 Merge branch 'master' of https://github.com/nasa/openmctweb into search 2015-07-24 14:20:27 -07:00
Victor Woeltjen
9435e75461 Merge remote-tracking branch 'slhale/open33' into open47b 
Fix merge conflict in preparation to integrate nasa/openmctweb#47

Conflicts:
	platform/commonUI/browse/res/templates/browse/object-header.html
 2015-07-24 13:46:37 -07:00
shale
9143f5febd [Search] Comments and errors 
Changed TreeNodeController slightly to do error
checking. Also updated some comments.
 2015-07-24 13:03:18 -07:00
Shivam Dave
91bd58215a [Mobile] Size Adjustment 
Moved hamburger icon slightly up
using the padding instead of
margin.
 2015-07-24 12:38:01 -07:00
Shivam Dave
b37ee19fbc [Mobile] Size Adjustment 
Adjusted indentation size
on the tree. Also change size of the
hamburger icon to match the
object icon and moved it slightly
down.
 2015-07-24 12:35:19 -07:00
Shivam Dave
2355d354b3 [Mobile] Items List 
Flushes items left and
vertically centers the
title/details. Also cleaned
up the items classes in sass
files.
 2015-07-24 11:46:58 -07:00
Shivam Dave
a89f9eed42 [Mobile] Grid List/Gestures 
Context menu only shown with contextmenu
click on desktops (non-mobile devices). Also
edited items list in a folder's representation
to show the icon on the left side, with text
centered horizontally (only mobile).
 2015-07-23 16:47:57 -07:00
shale
341218e8f6 [Search] Tree hide change 
The tree is now hidden whenever there is
text in the search bar. (This allows for
the case when there are no search results,
but text in the search bar.)
 2015-07-23 16:24:38 -07:00
shale
7d495f6389 [Search] Hide tree 
The tree is hidden when there are
search results.
 2015-07-23 15:55:20 -07:00
shale
0feab1965c [Search] Attempt at scroll bars 
Attempted to make the search results scroll,
but failed for now. Created a div for the
search results, load icon, and load more
button, which are the elements desired to
be scrolled. Did not work because search
result labels have absolute position text.
 2015-07-23 15:12:13 -07:00
Shivam Dave
7993e4c03f [Mobile] Gestures 
Removed the hover coloring on
the tree menu on mobile by changing
original** scss code. Also added
check in ContextMenuGesture that
will only allow context menu to appear
in non-mobile browser.
 2015-07-23 15:01:14 -07:00
Shivam Dave
b592b89dc8 [Mobile] Clean Up 
Removed unnecessary transitions.:
 2015-07-23 14:15:01 -07:00
Shivam Dave
d115166dde [Mobile] Comments 
Added comments and removed
unwanted spec test code for
BrowseController.
 2015-07-23 13:48:21 -07:00
Shivam Dave
d176f9f811 [Mobile] Test 
Fixed BrowseControllerSpec.js to
account for the .treeslide
call and added a new test for thatasds
 2015-07-23 13:46:46 -07:00
shale
aa17d3034e [Search] Fixed excessive calls to setSelection 
There were excessive calls to TreeNodeController's
setSelection() due to a modification for search
compatibility. Changed to not call as often.
 2015-07-23 13:32:15 -07:00
shale
52a9fcf5d6 [Search] Changed highlight size 
The search item highlight when selected or
hovered over is now talled, and the margin
between search items is reduced to
counteract any effect to spacing.
 2015-07-23 13:29:11 -07:00
Shivam Dave
143e3eeb6c [Mobile] CleanUp/Tests 
Added tests inside spec files
for the QueryService, TreeNodeController,
and InfoGesture. Also cleaned up the
tree so that padding is used between
buttons instead of margins.
 2015-07-23 13:19:58 -07:00
shale
7b271dcb6b [Search] Highlight transitions 
Added transitions for when objects get
highlighted from selection or hover.
 2015-07-23 13:14:20 -07:00
shale
2680e466fa [Search] Tree selection syncs 
Selecting something in the search results now
also makes it selected in the filetree. It
remains selected even when the search results
are cleared. (The filetree does not
automatically expand to that position though.)
 2015-07-23 12:47:21 -07:00
shale
ebb5474b34 [Search] Hover and loading 
Added styling to result items when they are
hovered over.
Also added a loading icon.
 2015-07-23 11:41:17 -07:00
shale
4759162bb7 [Search] Added right padding 
Added padding to the right side of the
search holder to match the tree holder's
padding.
 2015-07-23 11:08:31 -07:00
shale
deba184103 [Search] Selection remains across queries 
The selected object in the search results now
remains selected even after a new search is made.
It also will remain selected if it is clicked
on the file tree, but the file tree version is
not yet selected if it is clicked on the search
results list.
 2015-07-23 10:56:38 -07:00
shale
c65a278fcf [Search] Selecting results works 
Can now click on search results. The view will
be updated, as well as the selected object
being higlighted.
 2015-07-23 10:50:00 -07:00
Shivam Dave
b3bc8b6876 [Mobile[ Tests 
Added jasmine test for

QUerySerivce and adjusted
the InfoGestureSpec to
account for use of
QueryService.
 2015-07-23 09:28:36 -07:00
shale
8c08f7b93e [Search] Less space above tree 
Removed the awkward spacing between the filetree
and the search bar. Now 'My Items' appears just
below the search bar.
Also added .search-holder to the sass, but haven't
done anything with it yet.
 2015-07-23 09:25:10 -07:00
shale
501e426868 [Search] Centered load more button 
More correctly centered the load more button,
so that when the left panel is resized,
the button remains in the middle.
Additionally, added more comments to the sass.
 2015-07-22 16:35:41 -07:00
shale
b0e7dca985 [Search] Empty search resets results 
When there is no input into the search bar
no results are displayed/displayed results
are removed. This is because the search
providers were changed to return empty
arrays for empty search strings.
 2015-07-22 16:09:14 -07:00
shale
b16af5fe3e [Search] Renaming search and searchbar 
Changed what was previously just 'search' and
renamed to 'search view'. Then, took what was
previously 'searchbar' and renamed to
'search'.
 2015-07-22 15:43:28 -07:00
Shivam Dave
1f7ba70ad7 [Mobile] Scroll Bug 
Removed scrollbar that appears in landscape
mode in tree menu.
 2015-07-22 15:21:34 -07:00
shale
1dbe039be8 [Search] Load more button style 
Styled the load more button to match
the general theme.
 2015-07-22 15:17:27 -07:00
shale
d82538a799 [Search] Item background highlight 
Each result item now has a highlighted
background, with correct rounding of
edges. Need to now detect when to
highlight (on selection).
 2015-07-22 14:48:14 -07:00
shale
dcd4006017 [Search] Positioning fixed 
Fixed the search results so that they
now display correctly, with overflow
hidden, and no unusual positioning.
Also changed font size to 0.8em.
 2015-07-22 13:43:54 -07:00
Shivam Dave
7aba3b6672 [Mobile] Clean Up 
Removed gap below bottom bar. Moved
around constants for the resizing
of the tree. Also added comments in
layout and reformatted that slightly.
 2015-07-22 12:53:49 -07:00
shale
3ae681c79c [Search] Colors and positioning 
Corrected the colors back to the normal
style. Also made the text on the same
line as the icon, but this fix is a
temporary one.
 2015-07-22 12:33:20 -07:00
shale
ab3d3ec45b [Search] Overflow text 
Overflow text on the search item labels
is now hidden, with ellipses.
New problem: Text is  on a different
line than the icon.
 2015-07-22 11:48:13 -07:00
shale
ff3770c9ee [Search] Added css classes 
Added classes to the HTML so that CSS and
Sass could get access to style the
searchbar items. The structure for styling
is now mostly set up.
 2015-07-22 11:21:14 -07:00
shale
bcc1e2e26f [Search] Starting front-end 
Starting to modify the front-end so that
the searchbar appears in the tree view
area. Made the tree holder have relative
position so that the searchbar is visibile
for now. (Later will be different.)
 2015-07-22 10:38:56 -07:00
Shivam Dave
926b3d075c [Mobile] Clean Up 
Cleaned up scss files. Removed
repeated statements and added
comments. Also commented js files
like QueryService and InfoGesture.
 2015-07-22 10:25:21 -07:00
shale
b5f8e6d90c [Search] Updating searchbar 
Updating the searchbar to be again more
similar to the search view. It now has
a 'load more' button, but it is not
clickable for some reason. In progress.
 2015-07-21 16:21:23 -07:00
Shivam Dave
827cb27f28 [Mobile] Menu 
Added margin to top of tree list items.
Also removed hovering Info coming
up on mobile devices.
 2015-07-21 16:19:59 -07:00
Shivam Dave
0842f464db [Mobile] Menu Adjustment 
Makes highlight go all the way to right.
Also makes the arrow be absolute on the
right side, making it aligned to right.
 2015-07-21 14:29:13 -07:00
Shivam Dave
56e51ea32a [Mobile] Reformat of menu 
Reformats menu to move the
arrow to the right and now
that is what selects an object.
Pressing the actual menu item will
enact the dropdown menu. This
only happens on mobile platforms.
 2015-07-21 13:29:45 -07:00
Shivam Dave
dcdafbaebf [Mobile] Fix Shift 
Shifting occurring during transition
fixed by making transition backface-
visibility hidden during the
transition.
 2015-07-20 10:25:27 -07:00
Shivam Dave
f98915cddd [Mobile] Comments 
Added comments to the mixin list.
 2015-07-20 09:51:37 -07:00
Shivam Dave
4e6c307684 [Mobile] Transition 
Adjusts transition time on fade.
 2015-07-20 09:48:12 -07:00
Shivam Dave
ce6d74390e [Mobile] Clean-Up 
Removed unnecessary classes. Also added
comments and adjusted menu sizes.
 2015-07-20 09:39:06 -07:00
Shivam Dave
6e406fd060 [Mobile] Right Pane sets 
Right pane sets the size of itself,
causing the left pane to re-adjust
to fit the screen based on it. Also
transitions work on the slide and the
fade in.
 2015-07-20 09:16:28 -07:00
Shivam Dave
2614427e0e [Mobile] Fix 
Fixed to open menu fully.
 2015-07-17 14:32:33 -07:00
Shivam Dave
272c6bca97 [Mobile] Create Menu 
Create menu's is specified/overwritten
with 1000% (change) to fit on mobile).
Also gets rid of the right bar in that view.
 2015-07-17 10:50:02 -07:00
Shivam Dave
0d7387080d [Mobile] Create Menu 
Create menu text has ellipsis
attribute now, so if text is cut off
it will have a '...' appended to it.
Also added comments to mixins.
 2015-07-17 10:28:19 -07:00
Shivam Dave
1e2e20b145 [Mobile] Comments 
Added comments to the mixins.
 2015-07-17 09:04:39 -07:00
Shivam Dave
488829a20c [Mobile] Header 
Removed type from header
along with the right side buttons.
 2015-07-16 16:13:58 -07:00
Shivam Dave
85c7a36e25 [Mobile] Cleaned up 
Set the width of the create menu
text/components to fit the menu
however it gets cuttoff sometimes.
Next steps are to Clean up screen,
change the create menu to fit the left side,
and fix bottom space.
 2015-07-16 15:21:17 -07:00
Shivam Dave
d99b4d75d8 [Mobile] Fix 
Fixed the desktop version breaking.
CUrrent issue is hte menu is getting cut off.
 2015-07-16 14:07:25 -07:00
Shivam Dave
15a88967d0 [Mobile] Transition/Create Fix 
Fix the create button to work and
also transition well. Added transition mixin
to stay DRY.
 2015-07-16 13:22:07 -07:00
Shivam Dave
6e6fbe0d65 [Mobile] Transitions 
Made transitions properly work for
create button.
 2015-07-16 12:54:10 -07:00
Shivam Dave
180e5f14ae [Mobile] Cleaned up 
Made pane sass code more DRY by
using the phoneandtablet mixin
on repeated conditions.
 2015-07-16 12:25:06 -07:00
Shivam Dave
e9314898d2 [Mobile] Portrait & Landsc. 
Specifies amounts based on phone and tablet's
orientation. Not tested for the actual device,
but emulator. Also currently makes the create
button appear/disappear instead of smoothly sliding.
 2015-07-16 11:50:55 -07:00
Shivam Dave
ce75d19480 [Mobile] Desktop 
Cleans up the _layout by making the different
pane sizes device specific. Also adds a new
sass class just for desktop versions.
 2015-07-16 10:44:20 -07:00
shale
6f2ad0dadc [Search] Renaming and adding files 
Renamed QueryService as SearchService and changed
the corresponding references to it. Added a
SearchAggregator file and related files. Not
yet begun with the implementation.
 2015-07-16 10:10:07 -07:00
Shivam Dave
a9dd1f9828 [Mobile] Transistions 
Cleaned up and added transitions.
 2015-07-15 16:57:36 -07:00
Shivam Dave
4b5540830b [Mobile] Slide menu 
Rouch menu using important to
overwrite splitter setting of
amounts. Also has default values
for now for all devices.
 2015-07-15 16:49:16 -07:00
shale
3fcf061679 Merge branch 'master' of https://github.com/nasa/openmctweb into search-explore 2015-07-15 16:15:25 -07:00
Victor Woeltjen
e400f211c4 Merge remote-tracking branch 'nasa/open1404' into open1427 
Merge in preparation for review/integration, WTD-1427

Conflicts:
	platform/commonUI/general/res/templates/containers/accordion.html
 2015-07-15 13:45:37 -07:00
Shivam Dave
ee35976c92 [Mobile] Tree Mobile 
Added mobile/_tree.scss and edited
normal tree.scss to accomodate for
future sass that adjusts the tree
menu.
 2015-07-15 13:30:06 -07:00
shale
b94ef695e2 [Search] Creating searchbar 
Starting to create a search bar which lives
in the same side of the divder as the file
tree does.
 2015-07-15 13:29:45 -07:00
Shivam Dave
54b6cd1100 [Mobile] Debug 
Added debug statement to print
to console.
 2015-07-15 13:28:42 -07:00
Shivam Dave
0f89e98a71 [Mobile] Clean up 
Cleaned up layout and added phone only hider.
Also added tree.scss file, where all tree
node classes will be placed.
 2015-07-14 14:14:12 -07:00
shale
1455e5d8b5 [Browse] Removed destroy functions 
Removed destroy functions from menu arrow
controller and contetxt menu action as
suggested. #33, #47.
 2015-07-14 13:25:25 -07:00
shale
d1b55bd43e Merge branch 'master' of https://github.com/nasa/openmctweb into open33 2015-07-14 13:20:37 -07:00
Shivam Dave
6f07a21bb8 [Mobile] Clean-up 
Cleaned up scss and also, the
edit/new tab/full screen buttons are
hidden in mobile, temporarily.
 2015-07-14 13:10:28 -07:00
Shivam Dave
9a7bbd92bd [Mobile] Cleaned up 
Cleaned up the transistion css to
be more DRY.
 2015-07-13 17:04:14 -07:00
Shivam Dave
edcafc5835 [Mobile] Remove Bar 
Remove the splitter bar on mobile
and tablets.
 2015-07-13 13:56:44 -07:00
Shivam Dave
7d09df9a85 [Mobile] Constants 
Re-edited media query constants
to be cleaner and consistent.
 2015-07-13 13:11:27 -07:00
Shivam Dave
b00eee00fc [Mobile] Redefine 
Renames variables to be clearer.
Breaks up constants into parts to be
cleaners and straightforward. Also
removed the ratio.
 2015-07-13 13:02:57 -07:00
Shivam Dave
c0d83f9395 [Mobile] Format 
Reformatted the rwd media
query rules.
 2015-07-13 12:39:09 -07:00
Shivam Dave
be757066f5 [Mobile] Desktop adjusted 
Adjusted the desktop to accomodate browser
orientation changes. Done so by forgoing
checking the orientation because the
actual device can be in landscape, but it
reads orientation based on the viewport.
 2015-07-13 11:18:51 -07:00
Shivam Dave
885433390e [Mobile] Fix for emu and act 
Adds 2 landscape conditions for tablets and
phones to check if they are in landscape, in
the actual tablet, or in an emulate of the tablet,
then it displays.
 2015-07-13 10:32:58 -07:00
Shivam Dave
687f810475 [Mobile] Constants 
Fixed width constant to work for laptop.
 2015-07-13 10:23:28 -07:00
Shivam Dave
137a60f510 [Mobile] Constants 
Fixed constants to work for laptop.
 2015-07-13 10:16:52 -07:00
Dave
46d5a1431f [Mobile] Added Constants 
Rixed mis-initialized desktop
constant
 2015-07-13 09:24:01 -07:00
Dave
404d02ec23 [Mobile] Added Constants 
Re-edited constants to set min
ones for the desktop screen, that
is based on the device size.
 2015-07-13 09:17:59 -07:00
Shivam Dave
eec955317a revert back to 
4d9dc3624b
 2015-07-10 12:47:00 -07:00
Dave
67890a7298 [Mobile] Test 2015-07-10 12:38:04 -07:00
Dave
dd457f26c6 [Mobile] Device 
Added max width to tablet check.
 2015-07-10 12:32:34 -07:00
Dave
85c6bda5c9 [Mobile] Device 
Adjusted Tablet slide Constant.
 2015-07-10 12:21:13 -07:00
Dave
b7b5f87002 [Mobile] Device 
Adjusted Comp Constant.
 2015-07-10 12:16:43 -07:00
Dave
b0c5d807e7 [Mobile] Device 
Removes splits desktop
settings into 2, one
for landscape and another
for portrait.
 2015-07-10 11:51:56 -07:00
Dave
4d4776e0ef [Mobile] Device 
Removes desktop mixin settings
that do not use device width and
height.
 2015-07-10 11:40:57 -07:00
Dave
61e1aeb1d8 [Mobile] Device 
Removes desktop mixin settings
that do not use device width and
height.
 2015-07-10 11:40:14 -07:00
Dave
9caa603a65 [Mobile] Device 
Removes desktop mixin settings
that do not use device width and
height.
 2015-07-10 11:36:45 -07:00
Dave
5c99e469d5 [Mobile] Device Change 
Now instead of min-width, max-width,
... etc, uses the device-width/height.
This allows the devices to use the slide
menu while the browser on a desktop
consistently stays as desktop mode, no
matter if it is resized. As a result of this
the rwd is clear on phones/tablets, but not if
user resizes browser super small.
 2015-07-10 11:29:30 -07:00
Dave
4d9dc3624b [Mobile] Items 
Item icons disappear now on
tablets and mobile devices.
Adjusted _items.scss to adjust the
icon class display for phones and
tablets.
 2015-07-10 11:12:09 -07:00
Dave
d3ae4b729f [Mobile] More consistent 
More consistent when moving from
landscape to portrait and
vice-versa on devices. However
still encountering issue with
the browser being resized.
 2015-07-10 10:56:48 -07:00
Dave
30bed434fe [Mobile] Moved variables 
Moved variables used for amount of
side bar and slide amount into the
mobile/_constants.scss file.
 2015-07-10 09:02:46 -07:00
Dave
3e4ae4d38d [Mobile] 
Reverted changes to original controller file.
 2015-07-09 15:38:53 -07:00
Dave
7414275a85 [Mobile] 
Reverted changes to original scss file.
 2015-07-09 15:37:03 -07:00
Dave
fcb0033864 [Mobile] 
Reverted changes to css file.
 2015-07-09 15:32:41 -07:00
Dave
f079471a18 [Mobile] 
Reverted changes to scss file.
 2015-07-09 15:31:35 -07:00
Dave
1fb1174c0a [Mobile] Clean-Up 
Removed unused scss constant
.
 2015-07-09 15:19:29 -07:00
Dave
635e1eda69 [Mobile] Clean-Up 
Removed unused menu button and
cleaned up treeCl to be treeClass.
 2015-07-09 15:14:36 -07:00
Dave
40d53f941f [Mobile] TreeMenuController 
Removed the TreeMenuController.js file
and from the bundle. What this achieves
is already done in BrowseController.js
 2015-07-09 14:46:36 -07:00
Dave
684a0e88a2 [Mobile] Constants 
Added constants to the
mobile one with device
height.
 2015-07-09 14:26:02 -07:00
Dave
30a4f15330 [Mobile] Adjusted 
Adjusted the _layout.scss to
have a function that makes
something disappear on phone
and tablet.
 2015-07-09 14:11:51 -07:00
Dave
dfd08000f1 [Mobile] Adjust 
Adjusted the tablet amount
that the slide occurs.
 2015-07-09 13:42:07 -07:00
Dave
82c8d26264 [Mobile] 
Now does not display
the icon for the slide menu
on desktops.
 2015-07-09 11:16:41 -07:00
Dave
bd236e1cb1 [Mobile] Icon 
Added menu/hamburger icon.
 2015-07-09 11:06:25 -07:00
Dave
e47a36e799 [Mobile] Simplified 
treeSlide now uses one line that
sets it to true or false simply
like a switch. So not matter what
it will either slide or not.
 2015-07-09 10:55:52 -07:00
Dave
30efec0090 [Mobile] Angular 
Replaced document usage with
angular calls that change the ternary
op to flip the slide.
 2015-07-09 10:53:03 -07:00
Dave
b9371ea03d [Mobile] Moved Button 
Button moved to the Browse.html
and BrowseController handles the
tree slide.
 2015-07-09 10:28:45 -07:00
Dave
7974f33781 [Mobile] Phone 
Adjusted to differentiate
phones and tablets.
 2015-07-08 16:28:40 -07:00
Dave
cdcaedc8dd [Mobile] Added transistions 
Transistions added, however still using
document.getElementById.
 2015-07-08 15:57:08 -07:00
Dave
07ef4dfe8a [Mobile] Menu Slide 
Menu slides, but not transition
css slides out on click. Currently
uses document, which needs to be
replaced with angular version using
 and/or  and/or
ng-class and/or ng-click.
 2015-07-08 14:27:59 -07:00
Dave
342be0822f [Mobile] Gen css 2015-07-08 12:17:19 -07:00
Dave
5c56484889 [Mobile] Main scss added 
Added the mobile files as imports
to the main scss files that
generate as css files.
 2015-07-08 12:14:40 -07:00
Dave
2b4162c0be [Mobile] Reorganize 
Reorganized the sass files. To incorporate, new
mobile directory, which holds all the mobile
sass code.
 2015-07-08 12:11:48 -07:00
Dave
3704d64560 [Mobile] Push to show current 2015-07-08 11:08:31 -07:00
Dave
24fae72492 [Mobile] Left tree 
Attempt to resize left
tree menu when changing device.
Currently does not move the splitter
bar.
 2015-07-07 16:46:32 -07:00
Dave
79fb6eabd9 [Mobile] Menu Button 
Menu button added to the
bundle and as a file modelled
after the action button.
 2015-07-07 16:28:34 -07:00
Dave
1ddb00c8d6 [Mobile] Resize 
Resized the height of each
item in grid based on new
tablet/phone widths.
 2015-07-07 14:01:57 -07:00
Dave
8a0b77ec5c [Mobile] Folder View 
Folder representation now
will be a list.
 2015-07-07 13:02:40 -07:00
Sarah Hale
9e6d84a1d5 [Edit] No more tooltips 
Changed the attribute of 'title' on mct-container
to 'label'. This made the tooltips in Edit mode
dissapear. #46.
 2015-07-07 11:14:45 -07:00
Shivam Dave
2fc447e16f [Mobile] Comments 
Added comments and reverted the
grid back to normal.
 2015-07-07 10:15:25 -07:00
Shivam Dave
d828bf59f9 [Mobile] Constants/Etc 
Added constants for media queries.
in _constants.scss. Also, now on tablet,
zoom is disabled.
 2015-07-07 09:58:22 -07:00
Sarah Hale
b2a23ee968 [Browse] Tests completed 
Completed the menu arrow controller test. All
tests are now completed. #33.
 2015-07-07 09:28:01 -07:00
Shivam Dave
d8806f14aa [Mobile] Set viewport 
Viewport has been set in
index.html. Then what was
implemented prior to this
(rem-display and browser-manage)
was commented out.
 2015-07-07 09:08:16 -07:00
Shivam Dave
0c6a9ca857 [Mobile] Styles 
Added new style to set the width
of the tree.
 2015-07-06 13:15:38 -07:00
Sarah Hale
2b67ae42bf [Browse] Gesture and action tests 
The menu gesture and the menu action tests
are completed. #33.
 2015-07-02 14:00:54 -07:00
Sarah Hale
db920a7b5c [Browse] Starting tests 
Created new test files for the additions. #33.
 2015-07-02 12:50:48 -07:00
Sarah Hale
2524c75505 [Browse] Menu arrow works 
The menu arrow now displays a context menu
when clicked. #33.
 2015-07-02 12:36:35 -07:00
Sarah Hale
c08f972ab4 [Browse] Menu action called correctly 
Both the menu gesture and the menu arrow now
correctly call the menu action. #33.
 2015-07-02 11:57:03 -07:00
Sarah Hale
4e6301edb4 [Browse] Fixed multiple clicks 
Fixed having multiple calls to ContextMenuGesture. #33.
 2015-07-02 10:58:19 -07:00
Sarah Hale
3edd967e27 [Browse] Changed action key 
Changed the key for the context menu action from
'contextMenu' to 'menu'. #33.
 2015-07-02 10:30:45 -07:00
Sarah Hale
bb80b2175c [Browse] Gesture calling action 
The context menu gesture (attempts) to call the
context menu action. The menu arrow still fails
to call. #33.
 2015-07-02 09:36:19 -07:00
Sarah Hale
e9989ae00d [Browse] Some progress 
Still doesn't work.
 2015-07-01 14:32:49 -07:00
Charles Hacskaylo
fd98bdae4c [Frontend] Added $colorIconLink in _constants 
WTD-1404
 2015-07-01 10:07:47 -07:00
Charles Hacskaylo
793d39b969 [Frontend] CSS and font updates ONLY from open1423 
WTD-1404
CSS has error at this point due to missing $colorIconLink in _constants.scss;
(cherry picked from commit 2a032bf)
 2015-07-01 10:04:45 -07:00
Charles Hacskaylo
7e89c13839 [Frontend] Markup updates to label and grid-item 
WTD-1423
Depends on CSS and font updates in 2a032bf
 2015-07-01 09:50:53 -07:00
Charles Hacskaylo
2a032bf66d [Frontend] CSS and font updates ONLY from open1423 
WTD-1423
Cherry-pick this into open1404 to get latest fonts and CSS into open-master;
 2015-07-01 09:48:35 -07:00
Charles Hacskaylo
e0727e8485 [Frontend] Markup and CSS for link icon indicators 
WTD-1423
Added small icon to upper right;
IN PROGRESS;
 2015-06-30 18:13:17 -07:00
Charles Hacskaylo
d5d7ac90ac [Frontend] Markup and CSS for link icon indicators 
WTD-1423
Grid item version with link at bottom right of main icon;
 2015-06-30 17:58:56 -07:00
larkin
3e5fa30d9d [Style] Add stub for label link icon 2015-06-30 16:18:37 -07:00
Sarah Hale
9ad1c25d53 [Browse] Splitting up Menu Gesture 
Splitting up the context menu gesture's functionality into
separate context menu gesture and context menu actions.
The gesture watches for right-clicks, while the action
displays the menu. #33.
 2015-06-30 16:17:00 -07:00
Charles Hacskaylo
6a8cc6d9da [Frontend] Fixed line-height in .btn 
WTD-1404
 2015-06-30 16:07:55 -07:00
Charles Hacskaylo
9f38914faa [Frontend] Fixed styles that were breaking Create menu 
WTD-1404
 2015-06-30 16:01:53 -07:00
Charles Hacskaylo
f03a9bcc08 [Frontend] Merge mods for autoflow col width button 
WTD-1404
WTD-1411
 2015-06-30 15:51:22 -07:00
Charles Hacskaylo
2054dd8497 [Frontend] Removed pulse effect from pause-play button 
WTD-1404
WTD-1412
(cherry picked from commit 1b9521a)
 2015-06-30 15:47:15 -07:00
Sarah Hale
4840345524 [Browse] Stopped multiple broadcasts 
Stopped the menu arrow from making multiple
broadcasts of contextmenu. #33.
 2015-06-30 15:22:10 -07:00
Charles Hacskaylo
9b26a896d3 [Frontend] Fixes for dropdown menu click issues 
WTD-1404
WTD-1379
Context menu and view switcher menu fixed;
Removed <a> with <li> and put ng-click on <li>
 2015-06-30 14:12:24 -07:00
Charles Hacskaylo
06cf199872 [Frontend] Styling for context-available arrow 
WTD-1404
WTD-1422
 2015-06-30 13:35:21 -07:00
Sarah Hale
917d98bd3e [Browse] Created Menu Arrow 
Created a menu-arrow respresentation. #33.
 2015-06-30 13:33:40 -07:00
Sarah Hale
7b4ef142f5 [Browse] Fixed tree nodes 
Realized that this refers to a previously hidden arrow
at the main title at the top of the page. Reverted the
changes done to the tree nodes. #33.
 2015-06-30 13:32:25 -07:00
Charles Hacskaylo
344aa8acc8 [Frontend] Adding initialization CSS defs for new mct-split-pane 
WTD-1404
WTD-1399
 2015-06-30 13:26:15 -07:00
Charles Hacskaylo
9d25e3081f [Frontend] Edit mode refactored to use new mct-split-pane 
WTD-1404
WTD-1399
 2015-06-30 13:23:56 -07:00
Sarah Hale
57eefd7316 [Browse] Context menu gesture called 
The context menu gesture is called when the user clicks
the arrow next to the title of a domain object. This does
not yet display the context menu. It also does not yet
distinguish between edit and browse mode. #33.
 2015-06-30 11:18:56 -07:00
Charles Hacskaylo
c24a459f66 [Frontend] Plot legend minor cleanups 
WTD-1404
WTD-1386
 2015-06-30 10:38:10 -07:00
Charles Hacskaylo
abef44f37d [Frontend] Moved browse mode splitter settings to CSS file 
WTD-1404
WTD-1399
 2015-06-30 10:37:19 -07:00
Charles Hacskaylo
af2ca49b23 [Frontend] Added top right resize corner 
WTD-1404
WTD-1376
 2015-06-30 09:27:56 -07:00
Charles Hacskaylo
8ee28c3918 [Frontend] Removed z-index on hover 
WTD-1404
WTD-1383
 2015-06-30 09:00:06 -07:00
Charles Hacskaylo
29b91193fb [Frontend] New ? icon in symbols font 
WTD-1404
WTD-1402
 2015-06-30 08:50:06 -07:00
Victor Woeltjen
1c4cca3f91 Merge branch 'open1392b' into open-master 2015-06-29 16:30:48 -07:00
Victor Woeltjen
ef77ca91e7 Merge branch 'open1363' into open-master 2015-06-29 16:27:10 -07:00
Victor Woeltjen
970698c77b Merge remote-tracking branch 'nasa/open1392' into open1392b 
Conflicts:
	platform/commonUI/general/res/fonts/symbols/wtdsymbols.eot
	platform/commonUI/general/res/fonts/symbols/wtdsymbols.svg
	platform/commonUI/general/res/fonts/symbols/wtdsymbols.ttf
	platform/commonUI/general/res/fonts/symbols/wtdsymbols.woff
 2015-06-29 16:09:01 -07:00
Charles Hacskaylo
a7c90f2476 [Frontend] platform-specific changes to CSS, fonts and markup 
WTD-1392
WTD-1360
WTD-1394
New minus symbol added to font;
Updated folder symbols art;
CSS tweaked for reset button (WTD-1394) and direction sign;
Font project file updated;
(cherry picked from commit f6c7d8e)
 2015-06-29 14:39:46 -07:00
larkin
38ad8058e8 Merge remote-tracking branch 'origin/open1223' into open-1338 
Resolve merge conflicts due to whitespace changes.
 2015-06-29 12:08:16 -07:00
Victor Woeltjen
66f8ee7194 [Common UI] Fix min/max bounds of mct-split-pane 
WTD-1363. Use correct dimension (width or height)
when determining maximum splitter position.
 2015-06-29 11:54:40 -07:00
Victor Woeltjen
b524dc451f [Common UI] Remove unused function 
Remove obsolete function from mct-split-pane, WTD-1363
 2015-06-29 11:27:48 -07:00
Charles Hacskaylo
c262fe814c [Frontend] Added pointer-events: none 
WTD-1363?
 2015-06-29 11:08:28 -07:00
Victor Woeltjen
933927cda1 [Common UI] Reduce digest count 
Reduce number of digest cycles triggered by mct-resize;
only trigger a new digest cycle when size actually
changes. #19.
 2015-06-29 09:48:32 -07:00
Victor Woeltjen
12b34b5d58 Merge pull request #27 from shivamndave/open25 
Addresses #25
 2015-06-27 12:26:15 -07:00
Victor Woeltjen
a752a21bf8 Merge branch 'open-master' into open1388 2015-06-27 12:17:45 -07:00
Victor Woeltjen
8c5b497377 [Common UI] Tweak mct-split-pane 
Tweak mct-split-pane for use in timeline; particularly,
improve synchronization between views. WTD-1363.
 2015-06-27 11:59:18 -07:00
Victor Woeltjen
a0d5a1a196 [Common UI] Get split pane width from elements 
WTD-1363.
 2015-06-27 10:46:42 -07:00
Victor Woeltjen
c79b018c84 [Common UI] Remove obsolete checks 
Remove obsolete minimum/maximum checks, WTD-1363.
 2015-06-27 10:40:05 -07:00
Victor Woeltjen
a1eb15db77 [Common UI] Change min/max width handling in splitter 
In split pane, obey the min-width and max-width style properties
of first element within the pane. WTD-1363.
 2015-06-27 10:35:49 -07:00
Charles Hacskaylo
8841f25186 [Frontend] Create menu style normalized 
WTD-1392
WTD-1367
WTD-1391
Some significant reorging in _menus.scss and _constants;
Create menu normalized with context menu styles;
Bottom bar of overlay overflow set to visible to prevent button clipping;
 2015-06-26 18:38:33 -07:00
Charles Hacskaylo
e3cb9dae5a [Frontend] Bottom bar restyled 
WTD-1392
WTD-1362
Fixed font size in botttom bar;
Added font-smoothing to global.scss;
Bottom bar design restyled;
 2015-06-26 17:12:24 -07:00
Victor Woeltjen
72c812cdaa [Common UI] Enforce split pane min/max 
WTD-1363.
 2015-06-26 16:30:39 -07:00
Victor Woeltjen
39372ea9ca [Common UI] Use mct-split-pane in Browse 
WTD-1363.
 2015-06-26 16:21:20 -07:00
Victor Woeltjen
0ee76421e0 [Common UI] Add mct-splitter 
WTD-1363.
 2015-06-26 15:59:16 -07:00
Charles Hacskaylo
83be455b0b [Frontend] Added user-select: none to .btn, .l-btn class 
WTD-1392
WTD-1074
 2015-06-26 15:52:07 -07:00
Charles Hacskaylo
50bf7b7b32 [Frontend] Removed crosshair cursor from image class 
WTD-1392
WTD-1371
 2015-06-26 15:38:38 -07:00
Charles Hacskaylo
0fd1fb709b [Config] Fix for priority of New Tab button 
WTD-1392
WTD-1359
Set "Open in new tab" button to have priority "preferred";
Set fullscreen mode button to priority "default";
Tweaked full screen button tooltip text;
 2015-06-26 15:36:55 -07:00
Victor Woeltjen
243c832c25 [Common UI] Add mct-split-pane 
Add mct-split-pane directive, to simplify adding splitters.
WTD-1363.
 2015-06-26 15:32:37 -07:00
larkin
f9782f1f45 Merge remote-tracking branch 'origin/open1273' into open-1340 2015-06-26 15:03:19 -07:00
Victor Woeltjen
f8f2019dad Merge remote-tracking branch 'nasa/open1322' into open1388 2015-06-26 13:25:12 -07:00
Shivam Dave
d42abfef98 [Addressability] Comments 
Added comments to the slight change in Browse
Controller and BrowseObjectController. WTD 25.
 2015-06-26 12:58:16 -07:00
Shivam Dave
2e716bdbe3 [Addressability} Unit Test 
Completed unit tests to accomodate
for url path check prior to setting
the current . WTD 23.
 2015-06-26 12:51:25 -07:00
Victor Woeltjen
2161707954 Merge pull request #24 from shivamndave/open23 
Addresses #23
 2015-06-26 12:41:43 -07:00
Shivam Dave
3de4473159 [Addressability] Re-Edit Bug 
Fixed re-edit but by implementing
what Victor said in issue #25. Adding
check on /browse/ part of url and then
changing route works WTD 23.
 2015-06-26 11:52:03 -07:00
Shivam Dave
cd70ed6f94 Merge remote-tracking branch 'upstream/master' into open23 2015-06-26 11:44:11 -07:00
Charles Hacskaylo
fce327a398 [Dev/Frontend] New symbol added to symbols font 
WTD-1322
Platform-only commit;
(cherry picked from warp1322 commit 7254013)
 2015-06-25 15:17:08 -07:00
Shivam Dave
2a347f1596 [Windowing] urlService 
Removed the urlService from the edit
and browse bundles. Added the urlService
to the general bundle. WTD 23.
 2015-06-25 14:53:52 -07:00
Sarah Hale
bf8b0bae03 Merge branch 'master' of https://github.com/nasa/openmctweb into open18 2015-06-25 14:51:18 -07:00
Shivam Dave
193df4fde3 [Windowing] Excess function 
Removed extra function from
urlService. WTD 23.
 2015-06-25 14:37:01 -07:00
Shivam Dave
3d0e0af7f2 [Windowing] Remove variable 
Excess variable used for CancelAction's
ReturnToBrowse. WTD 23.
 2015-06-25 14:28:38 -07:00
Shivam Dave
5ba0f9d7a1 Merge remote-tracking branch 'upstream/master' into open23 2015-06-25 14:08:46 -07:00
Shivam Dave
3a371483ab [Windowing] urlService 
Added the urlService to the unit
tests for the cancel and save buttons
also removed unused services. WTD 23.
 2015-06-25 14:07:02 -07:00
Shivam Dave
6d28add055 [Windowing] urlService 
urlService added to the edit action
bundle.json in addition to being
implemented, however 2nd time edit
bug still occurring. Also fixed urlService
test suite. WTD 23.
 2015-06-25 13:16:15 -07:00
Victor Woeltjen
bd5ba48270 Merge remote-tracking branch 'github/master' into open-master 2015-06-25 12:05:34 -07:00
Victor Woeltjen
3df12788f9 Merge remote-tracking branch 'nasa/open1341' into open1345 2015-06-25 11:53:13 -07:00
Charles Hacskaylo
685e384858 [Dev/Frontend] PLATFORM CHANGES: use data-value instead of css class selection 
WTD-1341
(cherry picked from commit 5151637 in warp1341)
telemetry.html now uses data-value instead of class;
Mods to effects.scss to add customKeyframes mixin;
Added default transition time to mixin trans-prop-nice in mixins.scss;
 2015-06-25 11:46:15 -07:00
larkin
abaca86290 Merge remote-tracking branch 'origin/open1291' into open-1330 2015-06-25 11:30:33 -07:00
Shivam Dave
fd6459394a [Windowing] urlService 
Changed folder location of
services and therefore urlService
to general/src/ instead of being in
browse/src/. WTD 23.
 2015-06-25 10:38:39 -07:00
Shivam Dave
93ba4ce715 [Windowing] Unit Test 
Added Unit test adjustments for
the change in urlService (addition
of a separate function for getting
the url for a location, used by browse
controller. WTD 23.
 2015-06-25 10:10:13 -07:00
Victor Woeltjen
70f5a001ee Merge remote-tracking branch 'nasa/open1341' into open1345 2015-06-25 10:06:18 -07:00
Sarah Hale
c6405c50df Merge branch 'master' of https://github.com/nasa/openmctweb into open18 2015-06-25 10:00:21 -07:00
Victor Woeltjen
d3ff49b90b Merge remote-tracking branch 'nasa/open1319' into open1320 2015-06-25 09:59:23 -07:00
Shivam Dave
ca6f44f7b6 [Windowing] URL Fix 
The URL malformation was caused by the same
function returning the view and index path for
both the newtab window and the browse controller
window. As a result, the BrowseController now only
uses a path that excludes the view and index paths,
like before the UrlService was added. Another,
separate function uses this url for the location
and includes the view and index paths for new
tabs, in order to maintain the current view. WTD 23.
 2015-06-25 09:47:58 -07:00
Victor Woeltjen
25d3a4d8c2 Merge remote-tracking branch 'nasa/open1323' into open1324 2015-06-25 09:25:42 -07:00
Victor Woeltjen
9ac6abe78f Merge remote-tracking branch 'nasa/open980' into open1342 2015-06-25 09:07:27 -07:00
Charles Hacskaylo
9f137513d9 Merge branch 'open-master' of https://trunk.arc.nasa.gov/git/wtd into open1341 2015-06-24 19:25:27 -07:00
Charles Hacskaylo
19748ba17c [Dev/Frontend] Cherry-picking platform changes from warp1341 
WTD-1341
Re-rendered css file;
 2015-06-24 18:56:38 -07:00
Charles Hacskaylo
52a7bd1033 [Dev/Frontend] Cherry-picking platform changes from warp1341 
WTD-1341
 2015-06-24 18:55:15 -07:00
Charles Hacskaylo
e357df2fe5 [Dev/Frontend] Cherry-picking platform changes from warp1341 
WTD-1341
 2015-06-24 18:52:52 -07:00
Shivam Dave
bd9010e2bc [urlService] CleanUp/Refactor 
Adjusted BrowseController's useRoute
to use the urlService instead. Also
adds urlService as a depency through
bundle. Unit test also adjusted to
account for a mockUrlService and
a different value being passed into
mockLocation.path(). WTD 16.
 2015-06-24 14:06:09 -07:00
Charles Hacskaylo
6a96f1d395 [Frontend] Added icomoon.io project file 2015-06-24 13:54:57 -07:00
Charles Hacskaylo
14a83e143c [Frontend] New symbols font and CSS adjustments 
WTD-980
WTD-396
Minor sanding and shimming;
Updated symbols;
Create super-menu now uses key color;
Removed unused wtdsymbols-v2* font files;
 2015-06-24 13:39:31 -07:00
Shivam Dave
c827c40c03 [Windowing] used 
Used  instead of window in the
NewTabAction. WTD 16.
 2015-06-24 12:58:48 -07:00
Shivam Dave
c606055a3b [Windowing] Format 
Slight formatting change.
WTD 16.
 2015-06-24 12:54:49 -07:00
Shivam Dave
6863af9cd9 [Windowing] Comment/Formatting 
Reformatted code and added comments
to the unit test. Also refined the
NewTabActionSpec unit test to be
clearer. WTD 16.
 2015-06-24 12:50:21 -07:00
Shivam Dave
13eef59e4f [Windowing] Unit Test 
Added mockContext to
UrlServiceSpec unit test
in order to reach the
domainObject's context
capability. WTD 16.
 2015-06-24 12:31:40 -07:00