ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-20 08:03:49 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

merging markup from prototype

Browse Source
This commit is contained in:
Henry
2016-01-11 14:52:45 -08:00
parent f8aa123122
commit 2a74117294
2 changed files with 3 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
platform/commonUI/general/res/templates/object-inspector.html
View File

@ -75,33 +75,6 @@
</mct-representation> </mct-representation>
</div> </div>
</div> </div>
</li> </mct-split-pane>
<li ng-if="contextutalParents.length > 0"> </div><!--/ PaneController -->
<em title="The location of this linked object.">Location</em>
<span class="inspector-location"
ng-repeat="parent in contextutalParents"
ng-class="{ last:($index + 1) === contextualParents.length }">
<mct-representation key="'label'"
mct-object="parent"
ng-model="ngModel"
ng-click="ngModel.selectedObject = parent"
class="location-item rep-object-label">
</mct-representation>
</span>
</li>
<li ng-if="primaryParents.length > 0">
<em title="The location of the original object that this was linked from.">Original Location</em>
<span class="inspector-location"
ng-repeat="parent in primaryParents"
ng-class="{ last:($index + 1) === primaryParents.length }">
<mct-representation key="'label'"
mct-object="parent"
ng-model="ngModel"
ng-click="ngModel.selectedObject = parent"
class="location-item rep-object-label">
</mct-representation>
</span>
</li>
</ul>
</div>
</span> </span>

2
platform/features/scrolling/res/templates/scrolling.html
View File

@ -1,5 +1,5 @@
<!-- <!--
Open MCT Web, Copyright (c) 2014-2015, United States Government Open MCT Web, Copyright (c) 2014-2015, United Statobes Government
as represented by the Administrator of the National Aeronautics and Space as represented by the Administrator of the National Aeronautics and Space
Administration. All rights reserved. Administration. All rights reserved.