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

950 Commits

Author SHA1 Message Date
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