Commit Graph

202 Commits

Author SHA1 Message Date
slhale
8c811c4a22 [Inspector] Change how inspection objects are changed
Instead of resetting the inspection objects
when a treenode is clicked, it is changed when
the view changes.
2015-08-27 16:53:13 -07:00
slhale
95791d5c3a [Inspector] Select domainObject with title
The inspector object array can be reset to the
domain object by clicking the title header.
2015-08-27 16:28:13 -07:00
slhale
bcf6bbf627 [Inspector] Lay groundwork for multiple selection
Created a new ngModel property for inspection
which is an array. Currently the array only
holds one object at a time, but it can be
expanded in the future.
2015-08-27 11:28:27 -07:00
slhale
01f5a4886b [Plot] Make plot legend items clickable
Clicking on a plot legend item now selects
that object. Currently that means that the
view is switched to that object. (Therefore
this only has an effect on telemetry panel
plots.)
2015-08-27 11:02:40 -07:00
slhale
815b8e040e [Inspector] Merge paneModel and treeModel
Use the treeModel for what the paneModel was
previously being used for. None of the
property names conflict. This allows the
right pane to access the treeModel info.
2015-08-27 10:49:57 -07:00
slhale
7a69bffb4a [Inspector] Add test
Added a test to the browse object controller to
regain 100% coverage. Tests initilization of
ngModel properties. #73.
2015-08-26 10:51:34 -07:00
slhale
7119f6f3a1 [Inspector] Splitter drag temporarily removes transition
Dragging mct-splitter will remove a 'slide'
class from the splitter's sibling while a
drag is in process, and then replace the
'slide' class. This allows the left and right
panes to have slide transitions for open/close,
but not when the splitter is being dragged. #73.
2015-08-26 10:23:18 -07:00
slhale
7e837c266d Merge branch 'master' of https://github.com/nasa/openmctweb into open73
Conflicts:
	platform/commonUI/browse/res/templates/browse.html
2015-08-25 14:59:13 -07:00
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
454b96c3c9 Merge branch 'master' of https://github.com/nasa/openmctweb into open73
Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
2015-08-24 13:06:44 -07:00
slhale
67e57081f4 [Inspector] Right pane transition
Created the sliding transition for when the
object inspector pane opens or closes.
2015-08-24 10:47:14 -07:00
slhale
7715acd4d4 [Inspector] Right pane opens and closes
Added collapser button to open and close
the right pane holding the object inspector.
2015-08-24 10:24:35 -07:00
slhale
7b5f07ae45 [Inspector] Inspector style
Added stlying to the inspector. Still need to find
proper icon. #73.
2015-08-20 16:52:21 -07:00
slhale
3343475973 [Inspector] Add mct-object-inspector representation
Still having some styling issues though.
2015-08-20 16:01:08 -07:00
slhale
71207d643a [Inspector] Left pane close works again
Moved ng-class up to a parent so that the
left position would be correct relative to
the left split overall. #73.
2015-08-20 15:21:14 -07:00
slhale
d9a65a1844 [Inspector] Add right pane
Added a right pane to the page. This was done by
putting an mct-split-pane nested inside of the
existsing mct-split-pane. #73.
2015-08-20 15:11:16 -07:00
slhale
dcfcfa74bb Merge branch 'master' of https://github.com/nasa/openmctweb into open72
Conflicts:
	platform/commonUI/general/res/css/theme-espresso.css
2015-08-20 13:25:39 -07:00
slhale
79529e4879 [Treeview] Open in new tab settings
When an object is opened in a new tab, the left
pane will be closed by default. Otherwise it will
be open by default. #72.
2015-08-20 13:14:57 -07:00
slhale
503c8e2f03 [Treeview] Collapse button styling
Changed color to better match topbar buttons.
Icon changes direction when pane is open vs
closed.
2015-08-20 13:02:40 -07:00
slhale
4b3ca316e1 [Treeview] Update tests
For the existence of ngModel
2015-08-20 11:50:44 -07:00
slhale
3f7b874b38 [Treeview] Remove console.log 2015-08-20 11:47:16 -07:00
slhale
d2bc8227c7 [Treeview] Create button and slide transition
Made the create button visible when the left
pane is closed. Added a transition between
opening and closing the pane.
2015-08-20 10:41:30 -07:00
slhale
62f7ca5a0a [Treeview] Treeview collapse toggle
Clicking on the pane tab now toggles the
treeview.
2015-08-19 16:57:11 -07:00
slhale
29b1cfa890 [Treeview] Rename variable for clarity
paneModel's pane to leftPane, for clarity
once a right pane is added.
2015-08-19 16:47:12 -07:00
slhale
e44e50823e [Treeview] Treeview collapse
Clicking on the pane tab now will make the treeview
invisible, and set the width to 0. BUT, this does
not immediately move the splitter bar, though it
does go to the correct width if clicked.
Needs more work.
2015-08-19 16:44:42 -07:00
slhale
4a730f875f [Treeview] Clicking toggles model property
Clicking on the pane tab icon toggles ngModel.pane
2015-08-19 16:29:55 -07:00
slhale
8108a3b81c [Treeview] Html style 2015-08-19 16:02:49 -07:00
slhale
b8958edf72 [Treeview] Fixing errors, commits 2015-08-19 16:00:51 -07:00
slhale
2b00b71da9 [Treeview] Error fixing
Trying to get mctSplitter error to be fixed.
Reverting to an extent.
2015-08-19 15:45:17 -07:00
slhale
9c912b62d3 [Treeview] Modified left splitter
Added a 'button' (which does not work yet). It
sticks out of the splitter like a tab.
2015-08-19 15:08:27 -07:00
Victor Woeltjen
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
slhale
ffd80ed42b [Treeview] Style
Changed indentation in the html
2015-08-19 13:12:37 -07:00
slhale
8dad6a3fd5 Merge browse files from branch 'mobile' into open72 2015-08-19 13:04:11 -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
Victor Woeltjen
c450c22ddd [Code Style] Satisfy JSLint
Add missing semicolons etc. to satisfy JSLint after
changes for WTD-1482.
2015-08-11 13:03:06 -07:00
Victor Woeltjen
f8a0ddb484 [Code Style] Avoid retaining reference to window
Avoid https://docs.angularjs.org/error/ng/cpws
by changing way reference to  is retained.
WTD-1482.
2015-08-10 12:39:56 -07:00
Victor Woeltjen
a77920bd18 [Code Style] Use prototypes in Browse bundle
WTD-1482.
2015-08-10 11:52:23 -07:00
Victor Woeltjen
31eb366e7f [JSDoc] Add namespace docs
WTD-1482.
2015-08-07 12:13:15 -07:00
Victor Woeltjen
eaaa1a19ca [JSDoc] Remove obsolete module references
WTD-1482
2015-08-07 11:55:38 -07:00
Victor Woeltjen
c08a460d30 [JSDoc] Add annotations
Bulk-add JSDoc annotations, WTD-1482.
2015-08-07 11:44:54 -07:00
Pete Richards
48a9eef924 Merge branch 'open-master' into open-965 2015-08-06 16:13:37 -07:00
Pete Richards
c80e9bfa26 [Style] JSLint Compliance 2015-08-06 15:21:28 -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
f72f88adfa [Location] Use parent id as location
Use the parent id as the location for a model.

This greatly reduces the recursive work that must be done
during move operations to keep the location accurate.

Additionally, the locationService now implements a method
`persistLocation` which can be used to persist the current object
location as it's original location.
2015-08-06 15:05:47 -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
larkin
40e85b718d [Creation] Store location of new objects
The creation service stores the location (the full path) to
the domain object as "model.location"
2015-08-04 11:24:50 -07:00