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
6a8cc6d9da
[Frontend] Fixed line-height in .btn
...
WTD-1404
2015-06-30 16:07:55 -07:00
9f38914faa
[Frontend] Fixed styles that were breaking Create menu
...
WTD-1404
2015-06-30 16:01:53 -07:00
f03a9bcc08
[Frontend] Merge mods for autoflow col width button
...
WTD-1404
WTD-1411
2015-06-30 15:51:22 -07:00
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
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
06cf199872
[Frontend] Styling for context-available arrow
...
WTD-1404
WTD-1422
2015-06-30 13:35:21 -07:00
917d98bd3e
[Browse] Created Menu Arrow
...
Created a menu-arrow respresentation. #33 .
2015-06-30 13:33:40 -07:00
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
344aa8acc8
[Frontend] Adding initialization CSS defs for new mct-split-pane
...
WTD-1404
WTD-1399
2015-06-30 13:26:15 -07:00
9d25e3081f
[Frontend] Edit mode refactored to use new mct-split-pane
...
WTD-1404
WTD-1399
2015-06-30 13:23:56 -07:00
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
c24a459f66
[Frontend] Plot legend minor cleanups
...
WTD-1404
WTD-1386
2015-06-30 10:38:10 -07:00
abef44f37d
[Frontend] Moved browse mode splitter settings to CSS file
...
WTD-1404
WTD-1399
2015-06-30 10:37:19 -07:00
af2ca49b23
[Frontend] Added top right resize corner
...
WTD-1404
WTD-1376
2015-06-30 09:27:56 -07:00
8ee28c3918
[Frontend] Removed z-index on hover
...
WTD-1404
WTD-1383
2015-06-30 09:00:06 -07:00
29b91193fb
[Frontend] New ? icon in symbols font
...
WTD-1404
WTD-1402
2015-06-30 08:50:06 -07:00
1c4cca3f91
Merge branch 'open1392b' into open-master
2015-06-29 16:30:48 -07:00
ef77ca91e7
Merge branch 'open1363' into open-master
2015-06-29 16:27:10 -07:00
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
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
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
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
