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

339 Commits

Author SHA1 Message Date
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
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
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
Charles Hacskaylo
e426e0e5ec Merging in latest from master 
#70
 2015-08-18 15:23:42 -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
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
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
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
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
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
19b80ded16 Merge remote-tracking branch 'origin/open1423' into open-965 2015-08-06 15:10:52 -07:00
Shivam Dave
7ca15a9de2 [Mobile] Representation 
Edited grid item to center
shared button.
 2015-08-06 14:11:59 -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
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
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
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
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
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
6e43a92191 [Mobile] Merge 
Fix Conflicts.
 2015-07-27 15:21:59 -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
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
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
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
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
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