Merge remote-tracking branch 'origin/tree-732'

platform/commonUI/general/res/templates/subtree.html

@@ -19,18 +19,6 @@
  this source code distribution or the Licensing information page available
  at runtime from the About dialog for additional information.
 -->
-<ul class="tree">
-    <li ng-if="!composition">
-        <span class="tree-item">
-            <span class="icon wait-spinner"></span>
-            <span class="title-label">Loading...</span>
-        </span>
-    </li>
-    <li ng-repeat="child in composition">
-        <mct-representation key="'tree-node'"
-                            mct-object="child"
-                            parameters="parameters"
-                            ng-model="ngModel">
-        </mct-representation>
-    </li>
-</ul>
+<mct-tree mct-object="domainObject" mct-model="ngModel.selectedObject">
+</mct-tree>
+

platform/commonUI/general/res/templates/tree/node.html

@@ -0,0 +1,4 @@
+<span class="tree-item menus-to-left">
+</span>
+<span class="tree-item-subtree">
+</span>

platform/commonUI/general/res/templates/tree/toggle.html

@@ -0,0 +1,2 @@
+<span class='ui-symbol view-control flex-elem'>
+</span>

platform/commonUI/general/res/templates/tree/tree-label.html

@@ -0,0 +1,8 @@
+<span class="rep-object-label">
+    <div class="t-object-label l-flex-row flex-elem grows">
+        <div class="t-item-icon flex-elem">
+            <div class="t-item-icon-glyph"></div>
+        </div>
+        <div class='t-title-label flex-elem grows'></div>
+    </div>
+</span>

platform/commonUI/general/res/templates/tree/wait-node.html

@@ -0,0 +1,27 @@
+<!--
+ Open MCT Web, Copyright (c) 2014-2015, United States Government
+ as represented by the Administrator of the National Aeronautics and Space
+ Administration. All rights reserved.
+
+ Open MCT Web is licensed under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0.
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
+ WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
+ License for the specific language governing permissions and limitations
+ under the License.
+
+ Open MCT Web includes source code licensed under additional open source
+ licenses. See the Open Source Licenses file (LICENSES.md) included with
+ this source code distribution or the Licensing information page available
+ at runtime from the About dialog for additional information.
+-->
+<li>
+    <span class="tree-item">
+        <span class="icon wait-spinner"></span>
+        <span class="title-label">Loading...</span>
+    </span>
+</li>