ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-04 04:14:09 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,772 Commits 989 Branches 212 Tags 191 MiB
33d88ecce0
Commit Graph

338 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Victor Woeltjen
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
shale
d1b55bd43e Merge branch 'master' of https://github.com/nasa/openmctweb into open33 2015-07-14 13:20:37 -07:00
Sarah Hale
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
Charles Hacskaylo
fd98bdae4c [Frontend] Added $colorIconLink in _constants 
WTD-1404
 2015-07-01 10:07:47 -07:00
Charles Hacskaylo
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
Charles Hacskaylo
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
Charles Hacskaylo
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
Charles Hacskaylo
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
Charles Hacskaylo
d5d7ac90ac [Frontend] Markup and CSS for link icon indicators 
WTD-1423
Grid item version with link at bottom right of main icon;
 2015-06-30 17:58:56 -07:00
larkin
3e5fa30d9d [Style] Add stub for label link icon 2015-06-30 16:18:37 -07:00
Charles Hacskaylo
6a8cc6d9da [Frontend] Fixed line-height in .btn 
WTD-1404
 2015-06-30 16:07:55 -07:00
Charles Hacskaylo
9f38914faa [Frontend] Fixed styles that were breaking Create menu 
WTD-1404
 2015-06-30 16:01:53 -07:00
Charles Hacskaylo
f03a9bcc08 [Frontend] Merge mods for autoflow col width button 
WTD-1404
WTD-1411
 2015-06-30 15:51:22 -07:00
Charles Hacskaylo
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
Charles Hacskaylo
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
Charles Hacskaylo
06cf199872 [Frontend] Styling for context-available arrow 
WTD-1404
WTD-1422
 2015-06-30 13:35:21 -07:00
Sarah Hale
917d98bd3e [Browse] Created Menu Arrow 
Created a menu-arrow respresentation. #33.
 2015-06-30 13:33:40 -07:00
Sarah Hale
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
Charles Hacskaylo
344aa8acc8 [Frontend] Adding initialization CSS defs for new mct-split-pane 
WTD-1404
WTD-1399
 2015-06-30 13:26:15 -07:00
Charles Hacskaylo
9d25e3081f [Frontend] Edit mode refactored to use new mct-split-pane 
WTD-1404
WTD-1399
 2015-06-30 13:23:56 -07:00
Sarah Hale
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
Charles Hacskaylo
c24a459f66 [Frontend] Plot legend minor cleanups 
WTD-1404
WTD-1386
 2015-06-30 10:38:10 -07:00
Charles Hacskaylo
abef44f37d [Frontend] Moved browse mode splitter settings to CSS file 
WTD-1404
WTD-1399
 2015-06-30 10:37:19 -07:00
Charles Hacskaylo
af2ca49b23 [Frontend] Added top right resize corner 
WTD-1404
WTD-1376
 2015-06-30 09:27:56 -07:00
Charles Hacskaylo
8ee28c3918 [Frontend] Removed z-index on hover 
WTD-1404
WTD-1383
 2015-06-30 09:00:06 -07:00
Charles Hacskaylo
29b91193fb [Frontend] New ? icon in symbols font 
WTD-1404
WTD-1402
 2015-06-30 08:50:06 -07:00
Victor Woeltjen
1c4cca3f91 Merge branch 'open1392b' into open-master 2015-06-29 16:30:48 -07:00
Victor Woeltjen
ef77ca91e7 Merge branch 'open1363' into open-master 2015-06-29 16:27:10 -07:00
Victor Woeltjen
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
Charles Hacskaylo
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
larkin
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
Victor Woeltjen
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
Victor Woeltjen
b524dc451f [Common UI] Remove unused function 
Remove obsolete function from mct-split-pane, WTD-1363
 2015-06-29 11:27:48 -07:00
Charles Hacskaylo
c262fe814c [Frontend] Added pointer-events: none 
WTD-1363?
 2015-06-29 11:08:28 -07:00
Victor Woeltjen
a752a21bf8 Merge branch 'open-master' into open1388 2015-06-27 12:17:45 -07:00
Victor Woeltjen
8c5b497377 [Common UI] Tweak mct-split-pane 
Tweak mct-split-pane for use in timeline; particularly,
improve synchronization between views. WTD-1363.
 2015-06-27 11:59:18 -07:00
Victor Woeltjen
a0d5a1a196 [Common UI] Get split pane width from elements 
WTD-1363.
 2015-06-27 10:46:42 -07:00
Victor Woeltjen
c79b018c84 [Common UI] Remove obsolete checks 
Remove obsolete minimum/maximum checks, WTD-1363.
 2015-06-27 10:40:05 -07:00
Victor Woeltjen
a1eb15db77 [Common UI] Change min/max width handling in splitter 
In split pane, obey the min-width and max-width style properties
of first element within the pane. WTD-1363.
 2015-06-27 10:35:49 -07:00
Charles Hacskaylo
8841f25186 [Frontend] Create menu style normalized 
WTD-1392
WTD-1367
WTD-1391
Some significant reorging in _menus.scss and _constants;
Create menu normalized with context menu styles;
Bottom bar of overlay overflow set to visible to prevent button clipping;
 2015-06-26 18:38:33 -07:00
Charles Hacskaylo
e3cb9dae5a [Frontend] Bottom bar restyled 
WTD-1392
WTD-1362
Fixed font size in botttom bar;
Added font-smoothing to global.scss;
Bottom bar design restyled;
 2015-06-26 17:12:24 -07:00
Victor Woeltjen
72c812cdaa [Common UI] Enforce split pane min/max 
WTD-1363.
 2015-06-26 16:30:39 -07:00
Victor Woeltjen
39372ea9ca [Common UI] Use mct-split-pane in Browse 
WTD-1363.
 2015-06-26 16:21:20 -07:00
Victor Woeltjen
0ee76421e0 [Common UI] Add mct-splitter 
WTD-1363.
 2015-06-26 15:59:16 -07:00
Charles Hacskaylo
83be455b0b [Frontend] Added user-select: none to .btn, .l-btn class 
WTD-1392
WTD-1074
 2015-06-26 15:52:07 -07:00
Charles Hacskaylo
50bf7b7b32 [Frontend] Removed crosshair cursor from image class 
WTD-1392
WTD-1371
 2015-06-26 15:38:38 -07:00
Victor Woeltjen
243c832c25 [Common UI] Add mct-split-pane 
Add mct-split-pane directive, to simplify adding splitters.
WTD-1363.
 2015-06-26 15:32:37 -07:00
larkin
f9782f1f45 Merge remote-tracking branch 'origin/open1273' into open-1340 2015-06-26 15:03:19 -07:00
Victor Woeltjen
f8f2019dad Merge remote-tracking branch 'nasa/open1322' into open1388 2015-06-26 13:25:12 -07:00
Victor Woeltjen
2161707954 Merge pull request #24 from shivamndave/open23 
Addresses #23
 2015-06-26 12:41:43 -07:00
Charles Hacskaylo
fce327a398 [Dev/Frontend] New symbol added to symbols font 
WTD-1322
Platform-only commit;
(cherry picked from warp1322 commit 7254013)
 2015-06-25 15:17:08 -07:00
Shivam Dave
2a347f1596 [Windowing] urlService 
Removed the urlService from the edit
and browse bundles. Added the urlService
to the general bundle. WTD 23.
 2015-06-25 14:53:52 -07:00
Sarah Hale
bf8b0bae03 Merge branch 'master' of https://github.com/nasa/openmctweb into open18 2015-06-25 14:51:18 -07:00
Shivam Dave
193df4fde3 [Windowing] Excess function 
Removed extra function from
urlService. WTD 23.
 2015-06-25 14:37:01 -07:00
Shivam Dave
5ba0f9d7a1 Merge remote-tracking branch 'upstream/master' into open23 2015-06-25 14:08:46 -07:00
Shivam Dave
6d28add055 [Windowing] urlService 
urlService added to the edit action
bundle.json in addition to being
implemented, however 2nd time edit
bug still occurring. Also fixed urlService
test suite. WTD 23.
 2015-06-25 13:16:15 -07:00
Victor Woeltjen
3df12788f9 Merge remote-tracking branch 'nasa/open1341' into open1345 2015-06-25 11:53:13 -07:00
Charles Hacskaylo
685e384858 [Dev/Frontend] PLATFORM CHANGES: use data-value instead of css class selection 
WTD-1341
(cherry picked from commit 5151637 in warp1341)
telemetry.html now uses data-value instead of class;
Mods to effects.scss to add customKeyframes mixin;
Added default transition time to mixin trans-prop-nice in mixins.scss;
 2015-06-25 11:46:15 -07:00
Shivam Dave
fd6459394a [Windowing] urlService 
Changed folder location of
services and therefore urlService
to general/src/ instead of being in
browse/src/. WTD 23.
 2015-06-25 10:38:39 -07:00
Victor Woeltjen
70f5a001ee Merge remote-tracking branch 'nasa/open1341' into open1345 2015-06-25 10:06:18 -07:00
Sarah Hale
c6405c50df Merge branch 'master' of https://github.com/nasa/openmctweb into open18 2015-06-25 10:00:21 -07:00
Victor Woeltjen
d3ff49b90b Merge remote-tracking branch 'nasa/open1319' into open1320 2015-06-25 09:59:23 -07:00
Victor Woeltjen
25d3a4d8c2 Merge remote-tracking branch 'nasa/open1323' into open1324 2015-06-25 09:25:42 -07:00
Victor Woeltjen
9ac6abe78f Merge remote-tracking branch 'nasa/open980' into open1342 2015-06-25 09:07:27 -07:00
Charles Hacskaylo
9f137513d9 Merge branch 'open-master' of https://trunk.arc.nasa.gov/git/wtd into open1341 2015-06-24 19:25:27 -07:00
Charles Hacskaylo
19748ba17c [Dev/Frontend] Cherry-picking platform changes from warp1341 
WTD-1341
Re-rendered css file;
 2015-06-24 18:56:38 -07:00
Charles Hacskaylo
52a7bd1033 [Dev/Frontend] Cherry-picking platform changes from warp1341 
WTD-1341
 2015-06-24 18:55:15 -07:00
Charles Hacskaylo
e357df2fe5 [Dev/Frontend] Cherry-picking platform changes from warp1341 
WTD-1341
 2015-06-24 18:52:52 -07:00
Charles Hacskaylo
6a96f1d395 [Frontend] Added icomoon.io project file 2015-06-24 13:54:57 -07:00
Charles Hacskaylo
14a83e143c [Frontend] New symbols font and CSS adjustments 
WTD-980
WTD-396
Minor sanding and shimming;
Updated symbols;
Create super-menu now uses key color;
Removed unused wtdsymbols-v2* font files;
 2015-06-24 13:39:31 -07:00
Charles Hacskaylo
fdfa35d1da [Frontend] New symbols font and CSS adjustments 
WTD-980
WTD-396
Changed glyph for stacked plots;
Normalized button line-heights and size of required symbol;
Updated symbol art in symbols font;
Restored mistakenly removed "menu" gesture to grid-item;
 2015-06-24 11:42:29 -07:00
Charles Hacskaylo
db3e132799 [Frontend] New symbols font and CSS adjustments, in-progress 
WTD-980
WTD-396
 2015-06-23 16:07:29 -07:00
Victor Woeltjen
d6a31dcef3 [Plot] Update failing specs 
Update failing specs for changes related to fixed duration
plots, WTD-1273.
 2015-06-23 14:17:28 -07:00
Charles Hacskaylo
c35c9c43b7 [Frontend] Tweak size of spinner 
WTD-1323
 2015-06-22 18:47:58 -07:00