alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'search' into open70

Browse Source 
Conflicts:
	platform/commonUI/browse/res/templates/browse.html
This commit is contained in:
slhale
2015-08-19 10:05:38 -07:00
parent 7f65ba236c d3ea67fbd9
commit 432ec519b6
5 changed files with 33 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
platform/commonUI/browse/res/templates/browse.html
View File

@@ -29,12 +29,11 @@
<mct-representation key="'create-button'" mct-object="navigatedObject">
</mct-representation>
<div class='holder search-holder abs'
ng-class="{active: treeModel.search}"
>
<mct-include key="'search'"
ng-class="{active: treeModel.search}">
<mct-representation key="'search'"
mct-object="domainObject"
ng-model="treeModel">
</mct-include>
</mct-representation>
</div>
<div class='holder tree-holder abs'
ng-hide="treeModel.search">