Merge branch 'master' of https://github.com/nasa/openmctweb into open33

This commit is contained in:
shale
2015-07-14 13:20:37 -07:00
3 changed files with 4 additions and 4 deletions

View File

@@ -164,7 +164,7 @@
{
"key": "accordion",
"templateUrl": "templates/containers/accordion.html",
"attributes": [ "title" ]
"attributes": [ "label" ]
}
],
"representations": [

View File

@@ -20,7 +20,7 @@
at runtime from the About dialog for additional information.
-->
<div class="accordion-head" ng-click="toggle.toggle()">
{{container.title}}
{{container.label}}
</div>
<div class="accordion-contents"
ng-show="!toggle.isActive()"