ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-01-31 16:36:13 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'github/master' into open229b

Browse Source 
Merge latest into topic branch for nasa/openmctweb#229
in preparation for pull request
This commit is contained in:
Victor Woeltjen 2015-11-03 15:27:36 -08:00
commit c0ed19fd92
3 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -34,10 +34,9 @@
</mct-representation> </mct-representation>
<div class='holder search-holder abs' <div class='holder search-holder abs'
ng-class="{active: treeModel.search}"> ng-class="{active: treeModel.search}">
<mct-representation key="'search'" <mct-include key="'search'"
mct-object="domainObject"
ng-model="treeModel"> ng-model="treeModel">
</mct-representation> </mct-include>
</div> </div>
<div class='tree-holder abs mobile-tree-holder' <div class='tree-holder abs mobile-tree-holder'
ng-hide="treeModel.search"> ng-hide="treeModel.search">

10
platform/search/bundle.json
View File

@ -27,6 +27,12 @@
} }
], ],
"representations": [ "representations": [
{
"key": "search-item",
"templateUrl": "templates/search-item.html"
}
],
"templates": [
{ {
"key": "search", "key": "search",
"templateUrl": "templates/search.html" "templateUrl": "templates/search.html"
@ -34,10 +40,6 @@
{ {
"key": "search-menu", "key": "search-menu",
"templateUrl": "templates/search-menu.html" "templateUrl": "templates/search-menu.html"
},
{
"key": "search-item",
"templateUrl": "templates/search-item.html"
} }
], ],
"components": [ "components": [

4
platform/search/res/templates/search.html
View File

@ -53,12 +53,12 @@
</a> </a>
<!-- Menu --> <!-- Menu -->
<mct-representation key="'search-menu'" <mct-include key="'search-menu'"
class="menu-element search-menu-holder" class="menu-element search-menu-holder"
ng-class="{off: !toggle.isActive()}" ng-class="{off: !toggle.isActive()}"
ng-model="ngModel" ng-model="ngModel"
ng-click="toggle.setState(true)"> ng-click="toggle.setState(true)">
</mct-representation> </mct-include>
</div> </div>
<!-- Active filter display --> <!-- Active filter display -->