alihan/openmct
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #735 from nasa/open729

Browse Source 
Review and integrate open729
This commit is contained in:
Andrew Henry
2016-03-14 16:12:18 -07:00
parent dfb0a570a3 bf3b964ad2
commit 4e89ffbe07
11 changed files with 140 additions and 114 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/commonUI/browse/res/templates/browse/object-properties.html
View File

@@ -32,6 +32,7 @@
</li>
<li ng-if="contextutalParents.length > 0">
<em class="t-inspector-part-header" title="The location of this linked object.">Location</em>
<div ng-if="primaryParents.length > 0" class="section-header">This Object</div>
<span class="inspector-location"
ng-repeat="parent in contextutalParents"
ng-class="{ last:($index + 1) === contextualParents.length }">
@@ -44,7 +45,7 @@
</span>
</li>
<li ng-if="primaryParents.length > 0">
<em class="t-inspector-part-header" title="The location of the original object that this was linked from.">Original Location</em>
<div class="section-header">Object's Original</div>
<span class="inspector-location"
ng-repeat="parent in primaryParents"
ng-class="{ last:($index + 1) === primaryParents.length }">