89cb6867bd
Merge branch 'master' of https://github.com/nasa/openmctweb into search
2015-08-11 14:32:39 -07:00
48a9eef924
Merge branch 'open-master' into open-965
2015-08-06 16:13:37 -07:00
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
19b80ded16
Merge remote-tracking branch 'origin/open1423' into open-965
2015-08-06 15:10:52 -07:00
63a99f26f6
Merge branch 'mobile_3' into mobile
2015-08-06 14:13:13 -07:00
7ca15a9de2
[Mobile] Representation
...
Edited grid item to center
shared button.
2015-08-06 14:11:59 -07:00
0bc4f2dc6e
Merge remote-tracking branch 'upstream/master' into mobile
2015-08-06 13:45:37 -07:00
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
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
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
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
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
a073ef69ac
[Mobile] Back Arrow
...
Shifted Back Arrow down to
align with header.
2015-07-28 15:15:42 -07:00
3c6c420023
[Mobile] Back Arrow
...
Back Arrow implemented
by getting parent and then
navigating to it.
2015-07-28 15:08:14 -07:00
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
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
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
6e43a92191
[Mobile] Merge
...
Fix Conflicts.
2015-07-27 15:21:59 -07:00
6b02295bf4
Merge branch 'master' of https://github.com/nasa/openmctweb into search
2015-07-24 14:20:27 -07:00
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
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
7d495f6389
[Search] Hide tree
...
The tree is hidden when there are
search results.
2015-07-23 15:55:20 -07:00
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
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
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
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
ce6d74390e
[Mobile] Clean-Up
...
Removed unnecessary classes. Also added
comments and adjusted menu sizes.
2015-07-20 09:39:06 -07:00
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
488829a20c
[Mobile] Header
...
Removed type from header
along with the right side buttons.
2015-07-16 16:13:58 -07:00
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
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
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
6e6fbe0d65
[Mobile] Transitions
...
Made transitions properly work for
create button.
2015-07-16 12:54:10 -07:00
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
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
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
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
3fcf061679
Merge branch 'master' of https://github.com/nasa/openmctweb into search-explore
2015-07-15 16:15:25 -07:00
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
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
edcafc5835
[Mobile] Remove Bar
...
Remove the splitter bar on mobile
and tablets.
2015-07-13 13:56:44 -07:00
635e1eda69
[Mobile] Clean-Up
...
Removed unused menu button and
cleaned up treeCl to be treeClass.
2015-07-09 15:14:36 -07:00
dfd08000f1
[Mobile] Adjust
...
Adjusted the tablet amount
that the slide occurs.
2015-07-09 13:42:07 -07:00
82c8d26264
[Mobile]
...
Now does not display
the icon for the slide menu
on desktops.
2015-07-09 11:16:41 -07:00
bd236e1cb1
[Mobile] Icon
...
Added menu/hamburger icon.
2015-07-09 11:06:25 -07:00
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
b9371ea03d
[Mobile] Moved Button
...
Button moved to the Browse.html
and BrowseController handles the
tree slide.
2015-07-09 10:28:45 -07:00
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
3704d64560
[Mobile] Push to show current
2015-07-08 11:08:31 -07:00
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
