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
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
f4b87cf70d
[Project source] Updated icomoon.io symbols font project file
2015-08-17 15:47:28 -07:00
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
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
140d767026
[Code Style] Use prototypes in general UI bundle
...
WTD-1482.
2015-08-11 09:47:54 -07:00
31eb366e7f
[JSDoc] Add namespace docs
...
WTD-1482.
2015-08-07 12:13:15 -07:00
c08a460d30
[JSDoc] Add annotations
...
Bulk-add JSDoc annotations, WTD-1482.
2015-08-07 11:44:54 -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
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
ec87ac7652
[Search] Comments
2015-08-04 10:37:47 -07:00
8f65c73c8a
[Search] Recompile CSS
...
To make changes to the Sass reflected.
2015-08-04 10:36:46 -07:00
b6bb689ccc
[Search] Remove search UI files
...
Leaving only search service related files.
2015-08-04 10:31:52 -07:00
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
5569ef8b2d
Revert "[Search] Update CSS"
...
This reverts commit e05f16d780
2015-08-03 13:39:22 -07:00
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
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
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
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
9143f5febd
[Search] Comments and errors
...
Changed TreeNodeController slightly to do error
checking. Also updated some comments.
2015-07-24 13:03:18 -07:00
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
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
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
7b271dcb6b
[Search] Highlight transitions
...
Added transitions for when objects get
highlighted from selection or hover.
2015-07-23 13:14:20 -07:00
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
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
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
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
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
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
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
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
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
1dbe039be8
[Search] Load more button style
...
Styled the load more button to match
the general theme.
2015-07-22 15:17:27 -07:00
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
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
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
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
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
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
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
d1b55bd43e
Merge branch 'master' of https://github.com/nasa/openmctweb into open33
2015-07-14 13:20:37 -07:00
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
fd98bdae4c
[Frontend] Added $colorIconLink in _constants
...
WTD-1404
2015-07-01 10:07:47 -07:00
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
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
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
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
