ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2024-12-29 09:28:52 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
1,707 Commits 988 Branches 212 Tags 191 MiB
d5062c74a2
Commit Graph

1515 Commits

Author SHA1 Message Date
shale
7d495f6389 [Search] Hide tree 
The tree is hidden when there are
search results.
 2015-07-23 15:55:20 -07:00
shale
f4d34a2a9c [Search] mctControl for searchbar 
Attempting to generalize the searchbar using
mct-control. In progress.
 2015-07-23 15:29:19 -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
29d5535e7c [Search] Changed search load time 
Changed how frequently the search controller
checks for updates. This makes the load icon
dissapear faster, and looks more natural. But,
may affect performance.
Also changed the point at which the loading
status becomes 'true'. Made it earlier, at
the beginning of the controller's update().
 2015-07-23 11:48:19 -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
8f1f4eb177 [Search] Generic search gets all roots 
Generic search now automatically finds all
the roots before searching.
 2015-07-22 16:21:38 -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
57d45b24be [Search] Removed Search View 
Removed the search view from bundle.json because
the search in the left panel is the actualy
UI for searching. The search view is temporary.
 2015-07-22 13:46:40 -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
shale
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
shale
739fa423c5 [Search] Added wildcards to generic 
Added wildcard support to the generic
search provider. In this case, wildcards
behave just like spaces.
 2015-07-21 16:10:35 -07:00
shale
5f30249065 [Search] Load more option 
Made the search view have a 'Load more'
button. Added functionalty to allow this
to happen.
 2015-07-21 15:56:28 -07:00
shale
4191bc1ac3 [Search] Comments 
Updated the documentation.
 2015-07-21 15:31:23 -07:00
shale
92df11acc1 [Search] Readded ElasticSearch provider 
Previously had removed the elasticsearch provider
from bundle.json so could work on the generic
search web worker. Now have modified the
elasticsearch provider to match the new interface
with the aggregator, and it works.

At this point, search is 'working'
 2015-07-21 15:14:07 -07:00
shale
416bd82589 [Search] Cleanup 
Removed a couple of unnecissary things, and fixed
up the comments.
 2015-07-21 15:05:08 -07:00
shale
7934e8d425 [Search] Changed worker result implementation 
The interface remains the same, but the web worker
returns a pseudo dictionary (actually an object)
after being told the search. The key value pairs
for this dictionary are ids and scores.
 2015-07-21 14:55:44 -07:00
Pete Richards
cb56bbe569 [Documentation] Fix JSDoc syntax errors 2015-07-21 14:30:00 -07:00
shale
5a93e5a2bc [Search] Correct search updating 
The search controller now updates the display
results list, then repeatedly asks the
aggregator to update until the timestamps
all are at least as new as the one that the
controller originally gave for the query.
Basically, the search now updates correctly
without having to press enter again.
 2015-07-21 14:24:37 -07:00
shale
41c38f202d [Search] Comments 
Removed extra commented out code.
 2015-07-21 13:04:03 -07:00
shale
f0f396f656 [Search] Needs more updating 
The search aggregator now correctly gets
from the providers, but because of not
sync, the display is effectively one press
behind the correct search results.
Still, working to some extent.
 2015-07-21 12:59:52 -07:00
shale
a5febf8f0f [Search] Removed paging 
Removed the paging from the search view,
because later instead of paging there will
be a 'view more' option.
Also made the generic search provider
return searchResult objects instead of
raw domain objects.
 2015-07-21 12:44:14 -07:00
shale
4f4af87285 [Search] Added timestamp to queries 
(Temporariliy removed the elasticsearch provider
from bundle.json)
Added a timestamp parameter to the query so that
the aggregator can tell when the results were last
updated. Created a separate function for getting
the results list. GenericSearch now converts back
from models to domain objects after the web worker
does its work.
 2015-07-21 12:34:08 -07:00
shale
1b5fbccc06 [Search] Removed validType function 
Removed the validType function which previously
was a paraemter to the search providers. It
was no longer used, and is not necissary.
 2015-07-21 11:17:45 -07:00
shale
fc123cd367 [Search] In progress webworker 
Connecting GenericSearch to the web worker is still
in progress. The aggregator currently gets the
results before the web worker is finished. In process
of fixing sync issue.
 2015-07-21 11:14:13 -07:00
shale
a0f4b98eed [Search] Webworker search 
The web worker's search() appears to work. Now
we just need to link it in to the GenericSearch
as the primary means of searching.
 2015-07-21 10:35:33 -07:00
shale
7adcfc221a [Serach] Webworker indexes items 
The indexItem() part of the web worker seems
to be working at this point.
 2015-07-21 10:10:34 -07:00
shale
c1dcd8ea5b [Search] Framework of webworker implementation 
Made a basic outline of the desired web worker
implementation. (Functions present, now need to
implement them.)
 2015-07-21 09:58:19 -07:00
shale
74961e1106 [Search] Starting on workers 
Starting to work on using web workers to
do some of the work of GenericSearch.
Changed bundle.json accordingly.
 2015-07-21 09:44:14 -07:00
shale
c79d1f2648 [Search] Choose higher score & optional parameters 
Changed the search aggregator's filterRepeats
function to choose the version of the searchResult
object that has the higher score, when it
encounters multiple searchResult objects
corresponding to a domain object ID.
Also changed the search providers and aggregator
such that the validType parameter is now optional,
with a function that always returns true as the
defualt.
 2015-07-21 09:41:52 -07:00
shale
f4bd7d7a44 [Search] Revert to earlier commit 
Reverted to before implementing next(). May re add
back some changes, such as removing validType and
then adding web workers.
 2015-07-20 17:02:08 -07:00
shale
1891b24bde [Search] Dump before revert 
Commtting changes so far before revering
to a previous commit. Most changes to make
next() have been unneccsiary. We no longer
want next().
 2015-07-20 16:56:39 -07:00
shale
5520037908 [Search] Partial loading 
Changed the providers to return only the first
search result. Each searchResult object has a
function next() which returns the next search
result. This allows the search aggregator to
load more results without making a whole new
search query. (Still requuires some cleaning
up.)
 2015-07-20 14:30:22 -07:00
shale
c0c0371451 [Search] Timeout passed from SearchAggregator 
The timeout value is now an optional
parameter of the providers, and
the search aggregator now passes a
common default value to all of them.
 2015-07-20 11:21:55 -07:00
shale
ed956d351d [Search] Elasticsearch timeout 
Added a term to the elasticsearch query
that should make it time out. Apparently
this only works sometimes, as ES uses a
'best effort' timeout.
 2015-07-20 11:08:43 -07:00
shale
e9e9ca146b [Search] Generic search timeout 
Added a time limit for generic search's indexing
of the filetree, at which point it will just
return the portion of the filetree it has
indexed.
Additioanlly attempted to move this part of
the functionality to a webworker, but is not
working because of unclonability of the
objects. (Commented out)
Also updated some documentation comments.
 2015-07-20 10:59:02 -07:00
shale
e8b662571b [Search] Not case sensitive 
Made sure that generic search's matching is
not case sensitive.
 2015-07-17 14:06:48 -07:00
shale
2a784115d5 Merge branch 'master' of https://github.com/nasa/openmctweb into search 2015-07-17 13:49:19 -07:00
shale
9f5f14826b [Search] Changed generic's matching implementation 
Changed how the generic search provider determines
search matches. It now splits the search input into
search terms by spliting at spaces, and then scores
the results by how many of the terms appear as
substrings in the result.
 2015-07-17 13:49:09 -07:00
shale
c75d94289b [Serach] Callbacks and renaming 
Added validType() as a callback parameter to the search
providers. It is defined in the search aggregator, and
is used to put any restrictions on object type in the
displayed search results.
Renamed EverythingSearchProvider to GenericSearchProvider.
 2015-07-17 11:26:44 -07:00
Victor Woeltjen
2e2e7ee876 Merge branch 'open1444b' into open-master 2015-07-17 11:05:25 -07:00
Victor Woeltjen
affd5f8d29 Merge branch 'open1426' into open-master 2015-07-17 10:56:09 -07:00
shale
492dbcbc51 [Search] Comments and keypress 
Changed the controller for the search input
to respond on keypress rather than keyup.
Added comments better explaining searchResult
objects to the search aggregator.
 2015-07-17 09:33:10 -07:00
Victor Woeltjen
deed95d8d1 [Plot] Don't allocate charts for empty plots 
Don't allocate WebGL charts for empty plots, WTD-1444.
 2015-07-17 09:13:20 -07:00
shale
c82163fa7b [Search] Comments and style 2015-07-16 16:54:53 -07:00
shale
cf3169dd68 [Search] More generalized restrictions 
Moved the EverythingSearchProvider's term to item
matching to new functions, so that they can be
more easily modified later.
 2015-07-16 16:50:11 -07:00
shale
c1ebd50e4c [Search] Result paging 
The search view now can page the
results when there are many.
 2015-07-16 16:31:54 -07:00
shale
442a1979e7 [Search] Rudimentary scroing for manual 
Created a rudimentary scoring function for
the EverythingSearchProvider. Also corrected
the sorting by score function.
 2015-07-16 14:36:02 -07:00
shale
922a724e36 [Search] Removed unused file 
Removed SearchService.js, as now the searchService
is implemented using the aggregator and providers.
 2015-07-16 13:26:23 -07:00
shale
15a9d2380c [Search] Removed unnecissary dependency 
Removed an unnecissary parameter from the
search aggregator ($q).
 2015-07-16 13:11:00 -07:00
shale
80e0bd875a [Search] Aggregator merges results 
The search aggregator now merges search
results from different providers better.
It removed duplicate results, and orders
the list of results from highest to
lowest score.
 2015-07-16 13:08:05 -07:00
shale
bc2072b8c6 [Search] Removed unused search provider 
WARP search provider should not be
implemented here. And was not yet
implemented or used at all anyway.
 2015-07-16 11:33:36 -07:00
shale
25208a9074 [Search] Aggregator aggregates 
The search aggregator now combines the search
results from each search provider and returns
that. Objects may appear in the list more
than once.
 2015-07-16 11:31:30 -07:00
shale
cd3c2312a5 [Search] Basic aggregator works 
The search view now behaves as it
previously did. The search aggregator
is set to just use ElasticSearch, but
it works.
 2015-07-16 10:35:26 -07:00
shale
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
shale
1e05ebbfd7 [Search] Modified default input funct 
Renamed isDefaultInput() to isDefaultFormat(). It
currently just checks for 'name' or 'type' tags,
but it may be completely unneeded.
 2015-07-16 09:56:55 -07:00
shale
c5c3546b92 [Search] Relaxed quote rules 
Allowed quotes more often in search terms.
When there are quotes, that space-separated
term will not get the fuzzy identifier.
 2015-07-15 17:02:51 -07:00
shale
672fa74321 [Search] Changed default max results 
Changed the default number of max results to
be 100 results.
 2015-07-15 16:46:38 -07:00
shale
3fcf061679 Merge branch 'master' of https://github.com/nasa/openmctweb into search-explore 2015-07-15 16:15:25 -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
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
shale
759eaa3b35 [Search] Comments 2015-07-15 12:39:22 -07:00
shale
eee9309650 [Search] Fuzziness operator 
Insead of wildcards, adding the fuzziness
operator to searches to ensure completeness
of the search results.
 2015-07-15 12:14:30 -07:00
shale
e634d77a8e [Search] Add wildcards 
Added wildcards to most searches at the
front and end of each word that is separated
by spaces.
 2015-07-15 11:39:02 -07:00
shale
06b26b799e [Search] Comments 2015-07-15 11:10:04 -07:00
shale
d6720884f1 [Search] Elasticsearch search options 
Changed the search term processor to allow
the name and type options again (for
elasticsearch).
 2015-07-15 10:52:27 -07:00
shale
eb5946c1c1 [Search] Documentation 
Gave more verbose descriptions of queryManual
and queryElasticsearch.
 2015-07-15 10:49:24 -07:00
shale
227cb42ba7 [Search] Comments 2015-07-15 10:24:43 -07:00
shale
3420eb69d3 [Search] Manual max results option 
Manual search now takes a max number of
results option, just like the elasticsearch
version.
 2015-07-15 10:17:59 -07:00
shale
6b3088f241 [Search] Manual search works 
Manual search which does not use elasticsearch
implemented. It matches based on if the name
contains the search term as a substring.
 2015-07-15 10:13:14 -07:00
shale
fdcc6432f1 [Search] Reduced term processing 
Term processing may be unnecissary. Now it
is limited to removed spcaes from the front
and end.
 2015-07-15 09:25:10 -07:00
shale
f8e028a5d1 [Search] Outlined new function 
Started a new search function which manually
indexes all of the items in the tree. Still
not fully functional.
 2015-07-14 17:06:55 -07:00
Victor Woeltjen
ea19bde1e7 [Telemetry] Provide empty series 
Provide an empty series when a historical telemetry request
does not return anything for a given telemetry point.
Addresses WTD-1426.
 2015-07-14 15:51:13 -07:00
shale
5e6f1214fb [Search] Live search 
As the user types, search happens with each
new keypress, so the user does not need to
press enter. (But can press enter as well.)
 2015-07-14 15:24:51 -07:00
shale
0371e2e314 [Search] Made maxResults bigger 
Made it so that the default maximum
number of results is a larger number.
 2015-07-14 14:26:45 -07:00
shale
aa091a9d26 [Browse] Update tests 
Removed reference to destroy() in the
context menu action test. #33, #47.
 2015-07-14 13:53:00 -07:00
shale
1455e5d8b5 [Browse] Removed destroy functions 
Removed destroy functions from menu arrow
controller and contetxt menu action as
suggested. #33, #47.
 2015-07-14 13:25:25 -07:00
shale
d1b55bd43e Merge branch 'master' of https://github.com/nasa/openmctweb into open33 2015-07-14 13:20:37 -07:00
shale
dcb5af87a7 [Search] Moved result processing 
Moved result processing to its own function.
 2015-07-14 13:09:06 -07:00
shale
35d038e826 [Search] Processing as separate function 
Moved the search term processing to be its
own separate function.
 2015-07-14 12:55:00 -07:00
shale
27c7410318 [Search] Moved hard coding 
Moved where the search type is
prepended to the search term, to
allow future changes to it.
 2015-07-14 12:39:00 -07:00
shale
7c627fae8f [Search] More search options 
If the user searches with quotes (" or ') around
the search term, then the term processor will
not put wildcards around the search term.
 2015-07-14 12:32:56 -07:00
shale
bf0e6692f5 [Search] Comments 
Added comments to better explain how
input processing works.
 2015-07-14 11:41:23 -07:00
shale
1d0d2302d8 [Search] Moved functionality into QueryService 
Moved the actual searching implementation
into the query service. The search view
controller now just calls the query service.
 2015-07-14 11:31:53 -07:00
shale
1a8fd38430 [Search] Max results 
Changed the default number of results to be
a max of 25, and added a parameter to allow
the user to set this. (May be used in an
advaned search later?) Because folders are
filtered out, the number displayed is not
necissarily exact.
 2015-07-14 10:56:52 -07:00
shale
503811f69c [Search] Search behaves as expected 
Seaching any substring of a domain
object title now will give the domian
object as a search result. Still not
case sensitive. Empty string will
return all results. Special characters
do not search correctly. Still has
result number cap.
 2015-07-14 10:51:03 -07:00
shale
5892594668 [Search] More robust search 
Seach now searches using terms, which
are the domain objects' names split
at the spaces. Still does not work with
any substring, must be space separated.
Not case sensitive.
 2015-07-14 10:37:57 -07:00
shale
b9f8f6e33d [Search] Code style 2015-07-14 10:02:27 -07:00
shale
457193657f [Search] Added input ID parameter 
Added a parameter to the controller's search
function so that the html side can clearly
see/choose which input ID is being used as
the search input.
 2015-07-14 09:59:48 -07:00
shale
c92d15ba42 [Search] Cleanup 
Added and removed some comments, for clarity
 2015-07-14 09:55:26 -07:00
shale
d7dd53c2da [Search] Checks for folders 
Search now (again) checks to not add
folders to the results list. This later
should be made into a policy.
 2015-07-14 09:45:31 -07:00
shale
b35fddefc0 [Search] Removed getObjectByID 
Was no longer necissary with the current
method of search() getting objects.
 2015-07-14 09:38:44 -07:00
shale
07e08c283a [Search] Partway works 
The search function now returns actual
objects are results. They may not be the
correct results though.
 2015-07-14 09:36:58 -07:00
shale
89d0ea6506 [Search] Fixed uninitialized array bug 2015-07-14 09:17:14 -07:00
shale
75ce5cd0e9 [Search] Changed variable names 
Because of the async funtion, changed
variable names in serach2 to make more clear.
 2015-07-13 17:05:23 -07:00
shale
b994b2a862 [Search] Style 2015-07-13 16:57:27 -07:00
shale
3cb0b41b22 [Search] Poking around EasticSearch 
Sucessfully queries elasticsearch, but displaying the
results poses problems because of asych things.
 2015-07-13 16:53:48 -07:00
shale
5980575918 [Search] Fixed results display problem 
Fixed problem with search results not
properly being displayed in the search
view. (Checked that things were defined
before calling them.)
 2015-07-13 11:14:02 -07:00
shale
409d12aa75 [Search] Created QueryService 
Created a query service which handles the
creation of the searchable list of items.
This has partially broken the search view.
 2015-07-13 10:34:06 -07:00
shale
03c0678cbe [Search] Syle modifications 
Changed 'i += 1' in for loops to 'i++'
 2015-07-10 16:54:42 -07:00
shale
04257aedae [Search] Gets user input 
Now sucessfully gets user input for the
search term.
 2015-07-10 16:52:00 -07:00
shale
33b30f7583 [Search] Removed unnecissary variable 
Removed $scope.items, because it was unnecissary.
 2015-07-10 15:16:50 -07:00
shale
8eda495aa7 [Search] Results without folders 
Folders are now no longer included in
the results list.
 2015-07-10 15:06:19 -07:00
shale
a337e04fae [Search] Removed unnecessary file 
Removed search-item.html, as it was the same as
grid-item.html. Now search.html uses grid-item.html.
 2015-07-10 14:51:18 -07:00
shale
2e7f23a766 [Search] Results list displayed 
After searching, a results list is displayed.
The list is composed of grid-items.
 2015-07-10 14:48:15 -07:00
shale
6d1cb85a07 [Search] Not case sensitive 
Search is no longer case sensitive.
 2015-07-10 14:20:04 -07:00
shale
b5756d2b99 [Search] Items list updating 
The search results now updates the items
list when called to make sure that it gets
all of the recently added items.
 2015-07-10 12:53:12 -07:00
shale
efba0f0236 [Search] Search results by name 
doSearch() does search by getting each
object's name. Still buggy.
 2015-07-10 12:44:07 -07:00
shale
4e39c4f900 [Search] Finds root folder 
The search controller will now search from
the root folder (My Items) even when the view
is initiated from a folder inside of the tree.
 2015-07-10 10:32:58 -07:00
shale
e339ee1dd1 [Search] Asynchronous recursion 
The list creation now sucessfully goes 1 level
deep into the tree for objects. Still needs
more work to delve into subfolders.
 2015-07-09 14:40:52 -07:00
shale
94b306e129 [Search] Listify filetree 
SearchController now attempts to convert the filetree
into a list format. Still needs to be modified to be
asynchronous.
 2015-07-09 11:16:55 -07:00
shale
32eaf3893a [Search] Display search items 
The search view now very rudimentarily displays
some 'search-item's.
 2015-07-08 16:20:12 -07:00
shale
845b9a2faa [Search] Fixed comments 2015-07-08 15:34:09 -07:00
shale
5870248617 [Search] Search framework 
Created a basic framework for a search
view. It consists of a search bar and
a results list.
 2015-07-08 15:32:20 -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
Sarah Hale
b2a23ee968 [Browse] Tests completed 
Completed the menu arrow controller test. All
tests are now completed. #33.
 2015-07-07 09:28:01 -07:00
Sarah Hale
e3a96eff8d [Browse] Fixed clicking on menu 
Previously any click on the context menu would
close the context menu rather than doing the
appropriate action. This is now fixed. The menu
only closes when a click happens not on the
menu. #33.
 2015-07-02 15:34:11 -07:00
Sarah Hale
2b67ae42bf [Browse] Gesture and action tests 
The menu gesture and the menu action tests
are completed. #33.
 2015-07-02 14:00:54 -07:00
Sarah Hale
db920a7b5c [Browse] Starting tests 
Created new test files for the additions. #33.
 2015-07-02 12:50:48 -07:00
Sarah Hale
a582375e61 [Browse] Style 
All modified code follows style guides. #33.
 2015-07-02 12:38:32 -07:00
Sarah Hale
2524c75505 [Browse] Menu arrow works 
The menu arrow now displays a context menu
when clicked. #33.
 2015-07-02 12:36:35 -07:00
Sarah Hale
c08f972ab4 [Browse] Menu action called correctly 
Both the menu gesture and the menu arrow now
correctly call the menu action. #33.
 2015-07-02 11:57:03 -07:00
Sarah Hale
809a6e457c Merge branch 'master' of https://github.com/nasa/openmctweb into open33 2015-07-02 11:33:07 -07:00
Sarah Hale
30d8c1647c [Browse] Right click works 
Right clicking for a context menu now
works again. #33.
 2015-07-02 11:30:45 -07:00
Sarah Hale
4e6301edb4 [Browse] Fixed multiple clicks 
Fixed having multiple calls to ContextMenuGesture. #33.
 2015-07-02 10:58:19 -07:00
Sarah Hale
3edd967e27 [Browse] Changed action key 
Changed the key for the context menu action from
'contextMenu' to 'menu'. #33.
 2015-07-02 10:30:45 -07:00
Sarah Hale
bb80b2175c [Browse] Gesture calling action 
The context menu gesture (attempts) to call the
context menu action. The menu arrow still fails
to call. #33.
 2015-07-02 09:36:19 -07:00
Sarah Hale
e9989ae00d [Browse] Some progress 
Still doesn't work.
 2015-07-01 14:32:49 -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
Sarah Hale
9ad1c25d53 [Browse] Splitting up Menu Gesture 
Splitting up the context menu gesture's functionality into
separate context menu gesture and context menu actions.
The gesture watches for right-clicks, while the action
displays the menu. #33.
 2015-06-30 16:17:00 -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
Sarah Hale
4840345524 [Browse] Stopped multiple broadcasts 
Stopped the menu arrow from making multiple
broadcasts of contextmenu. #33.
 2015-06-30 15:22:10 -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
5f80fcabc6 [Imagery] Clear background image 
Clear background image on change, WTD-1407.
 2015-06-29 18:49:36 -07:00
Victor Woeltjen
397a545482 [Plot] Expand range to give margin for points 
Expand range to give some margin for points near the edge,
WTD-1406.
 2015-06-29 18:08:03 -07:00
Victor Woeltjen
fa8095d5bc Merge branch 'open-master' into open1317limits2 
WTD-1405

Conflicts:
	platform/features/layout/res/templates/elements/telemetry.html
 2015-06-29 17:30:33 -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
Victor Woeltjen
0b4aa730f4 Merge pull request #30 from slhale/open26 
[Events] Create tests for real time version
 2015-06-29 15:42:33 -07:00
Victor Woeltjen
87f982b03e Merge remote-tracking branch 'nasa/open-master' into open-master 2015-06-29 15:10:02 -07:00
Victor Woeltjen
29283e4fb5 Merge branch 'open1233' into open-master 2015-06-29 15:09:40 -07:00
larkin
cc64412d78 Merge remote-tracking branch 'origin/open1344' into open-1348 2015-06-29 14:58:27 -07:00
larkin
52cf918d08 Merge remote-tracking branch 'origin/open1317' into open-1346 2015-06-29 14:44:24 -07:00
Sarah Hale
2ab3932ce1 Merge branch 'master' of https://github.com/nasa/openmctweb into open26 2015-06-29 14:43:19 -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
Sarah Hale
f816b5018a [Events] Style 
Removed unused variables. #26.
 2015-06-29 13:15:56 -07:00
Victor Woeltjen
ebbac233aa Merge branch 'open1373' into open-master 2015-06-29 13:15:43 -07:00
Sarah Hale
b91b197f5b [Events] Comments 
Removed todo comment. #26.
 2015-06-29 13:14:51 -07:00
Sarah Hale
14694c675b [Events] All tests work 
All of the tests for the RT Events are working. #26.
 2015-06-29 13:13:05 -07:00
Sarah Hale
56c3e72d32 Merge branch 'master' of https://github.com/nasa/openmctweb into open26 2015-06-29 13:10:46 -07:00
Sarah Hale
6616dedf63 [Events] Controller test correction 
Test for the RT Event List controller now
actually works. #26.
 2015-06-29 13:09:15 -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
larkin
84345caf7d [Style] Convert tabs to spaces 2015-06-29 11:51:28 -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
Sarah Hale
4c6b3c7a13 [Events] Policy test correction 
The view policy test for real time Messages
actually now works. #26.
 2015-06-29 09:56:59 -07:00
Sarah Hale
d120c8b139 Merge branch 'master' of https://github.com/nasa/openmctweb into open26 2015-06-29 09:10:23 -07:00
Victor Woeltjen
762f4d59fc [Layout] Disallow folders 
Disallow layouts in folders, WTD-1373.
 2015-06-27 12:43:32 -07:00
Victor Woeltjen
12b34b5d58 Merge pull request #27 from shivamndave/open25 
Addresses #25
 2015-06-27 12:26:15 -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