Commit Graph

52 Commits

Author SHA1 Message Date
slhale
c81e2dbb4a Merge branch 'master' of https://github.com/nasa/openmctweb into search
Conflicts:
	platform/commonUI/general/src/controllers/TreeNodeController.js
	platform/persistence/elastic/src/ElasticSearchProvider.js
2015-08-24 13:14:43 -07:00
slhale
432ec519b6 Merge branch 'search' into open70
Conflicts:
	platform/commonUI/browse/res/templates/browse.html
2015-08-19 10:05:38 -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
slhale
d3ea67fbd9 [Search] Templates vs representations
Made the search and search-menu templates into
representations, to be more consistent.
2015-08-18 16:54:36 -07:00
slhale
89cb6867bd Merge branch 'master' of https://github.com/nasa/openmctweb into search 2015-08-11 14:32:39 -07:00
Pete Richards
48a9eef924 Merge branch 'open-master' into open-965 2015-08-06 16:13:37 -07:00
Pete Richards
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
Pete Richards
19b80ded16 Merge remote-tracking branch 'origin/open1423' into open-965 2015-08-06 15:10:52 -07:00
Pete Richards
37cd73c6e8 [Template] Move ng-click to parent node
Move the ng-click directive to the li element to match the element that receives
hover styles.

Fixes nasa/openmctweb#60.
2015-08-05 17:11:30 -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
341218e8f6 [Search] Tree hide change
The tree is now hidden whenever there is
text in the search bar. (This allows for
the case when there are no search results,
but text in the search bar.)
2015-07-23 16:24:38 -07:00
shale
7d495f6389 [Search] Hide tree
The tree is hidden when there are
search results.
2015-07-23 15:55:20 -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
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
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
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
3fcf061679 Merge branch 'master' of https://github.com/nasa/openmctweb into search-explore 2015-07-15 16:15:25 -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
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
e9989ae00d [Browse] Some progress
Still doesn't work.
2015-07-01 14:32:49 -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
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
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
Sarah Hale
917d98bd3e [Browse] Created Menu Arrow
Created a menu-arrow respresentation. #33.
2015-06-30 13:33:40 -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
Charles Hacskaylo
abef44f37d [Frontend] Moved browse mode splitter settings to CSS file
WTD-1404
WTD-1399
2015-06-30 10:37:19 -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
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
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
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
fec6f06849 [Addressability] Obey view query string param
Obey the query string parameter for a view, if present.
WTD-1149.
2015-06-16 14:58:03 -07:00
Charles Hacskaylo
39531a0a9f [Fronted] Minor final sanding and polishing
WTD-839
.t-view-switcher > .view-switcher;
Added CSS transition to hide/show of view-switcher;
Moved .view-switcher hide/show to _frame.scss;
Tweaked .frame:hover to raise z-index to show complete border;
2015-06-12 14:17:19 -07:00
Charles Hacskaylo
8f153d4e75 [Fronted] Significant refactoring of mixins for containers and buttons
WTD-839
Removal of 'icon-btn' class from *.html;
Cleanup of markup in switcher.html;
'name' span is now hidden when switcher is within frame;
Commented out unused css classes in _controls.scss,
Normalization of markup in object header when in main view and framed objects;
Icon sizing fixed in menus and switcher control;
Tightened up spacing in menus;
2015-06-12 11:44:09 -07:00
Charles Hacskaylo
0b8d5ceb86 [Fronted] Significant refactoring of btn classes
WTD-839
Refactoring in advance of style mods to switcher when in frame;
Moved btn styles from _controls.scss to _buttons.scss;
Markup cleaned up with css classing simplified;
2015-06-10 17:23:08 -07:00
Victor Woeltjen
10863514cb [Licenses] Add license headers
WTD-1051.
2015-05-13 16:43:30 -07:00
Charles Hacskaylo
aec1176dc4 [Frontend] Hiding non-functional items; padding adjustments
WTD-1163
WTD-1146
New CSS to hide non-functional elements, including browse.top-bar with search elements;
Adjusted spacing, mainly in .contents CSS class;
2015-05-01 10:10:35 -07:00
Charles Hacskaylo
cc181dbdc9 [Frontend] Form and form control enhancements
WTD-1002
Added Angular hooks to allow form elements to have JSON defined CSS classes
Form element cleanups
2015-03-10 22:36:35 -07:00
Charles Hacskaylo
433cdf8b1c In-progress checkin - NOT WORKING RIGHT YET! 2015-03-05 16:02:33 -08:00
Charles Hacskaylo
068518b535 [Frontend] Minor sanding
WTD-894
Fix to correct spacing problem in object-header
2015-02-25 18:59:36 -08:00
Victor Woeltjen
8fecaaf4f8 [Browse] Utilize splite pane directly
Utilize split pane controller directly from browse
template; quick fix for need to see more information
about packet/point names, WTD-747.
2015-01-28 16:34:03 -08:00
Victor Woeltjen
06b599ee37 [Browse] Begin implementing splitter movement
Begin implementing moveable splitter, WTD-747.
2015-01-28 16:25:16 -08:00
Victor Woeltjen
7ed62babe3 [Browse] Simplify view switcher event ordering
Don't pass a domainObject instance into mct-representation
until a view for that specific domainObject is available;
this avoids ordering issues where a new domainObject is
passed briefly to controllers in represented views before
a  event is issued, which can result in undesired
behavior for views that need to manage resources (such as
the subscriptions used to support telemetry retrieved
from the WARP Server, WTD-644.
2015-01-12 08:30:21 -08:00
Victor Woeltjen
6cd0cd8e3c [Layout] Refactor view switcher
Refactor view switcher to simplify it; treat it
as a representation of a domain object that modifies
an ng-model. This simplifies reuse, e.g. in frames
within a layout. WTD-535.
2014-12-04 12:12:41 -08:00
Victor Woeltjen
2476941eb2 [Forms] Add Locator control
Add Locator form control, to allow selection of a
destination for newly-created domain objects in a
tree. WTD-593.
2014-12-03 13:51:07 -08:00
Victor Woeltjen
e04b9828ea [Forms] Use ng-model for tree state
Use ng-model when communicating state to/from the
tree in browse mode. This will simplify implementation
of the Locator control, which also uses a tree, but
which should not set navigation state. WTD-593.
2014-12-03 13:18:51 -08:00
Victor Woeltjen
80ba6f4da3 [Forms] Reorganize Create templates
Reorganize templates associated with the Create menu in
preparation for adding the Locator control, used to
specify the destination folder for object creation.
WTD-593.
2014-12-03 12:56:53 -08:00