diff options
| author | Henry <akhenry@gmail.com> | 2016-01-12 01:52:45 +0300 |
|---|---|---|
| committer | Henry <akhenry@gmail.com> | 2016-01-12 01:52:45 +0300 |
| commit | 2a74117294dd6a78d9c1628e4b00a129b8afcd6f (patch) | |
| tree | f931290151a71a6218ac57dcec0b24f0c3eef476 | |
| parent | f8aa1231226f5c6cc4a7c1fb45e928106c2fdab7 (diff) | |
merging markup from prototypenem_implementation_a
| -rw-r--r-- | platform/commonUI/general/res/templates/object-inspector.html | 31 | ||||
| -rw-r--r-- | platform/features/scrolling/res/templates/scrolling.html | 2 |
2 files changed, 3 insertions, 30 deletions
diff --git a/platform/commonUI/general/res/templates/object-inspector.html b/platform/commonUI/general/res/templates/object-inspector.html index 1262e3a1e..5f3e4d522 100644 --- a/platform/commonUI/general/res/templates/object-inspector.html +++ b/platform/commonUI/general/res/templates/object-inspector.html @@ -75,33 +75,6 @@ </mct-representation> </div> </div> - </li> - <li ng-if="contextutalParents.length > 0"> - <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> + </mct-split-pane> + </div><!--/ PaneController --> </span> diff --git a/platform/features/scrolling/res/templates/scrolling.html b/platform/features/scrolling/res/templates/scrolling.html index 629c3472c..b6e3d0ff6 100644 --- a/platform/features/scrolling/res/templates/scrolling.html +++ b/platform/features/scrolling/res/templates/scrolling.html @@ -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 Administration. All rights reserved. |