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

Merge remote-tracking branch 'origin/open1423' into open-965

Browse Source
This commit is contained in:
Pete Richards
2015-08-06 15:10:52 -07:00
parent f72f88adfa 7e89c13839
commit 19b80ded16
5 changed files with 28 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
platform/commonUI/general/res/templates/label.html
View File

@@ -22,12 +22,14 @@
<span class="label s-label">
<span class='ui-symbol icon type-icon'>
{{type.getGlyph()}}
<span class='ui-symbol icon alert hidden'>!</span>
<!-- this will be toggled by a ng-show -->
<span
class='ui-symbol icon l-icon-link'
ng-show="true"
></span>
<span class='ui-symbol icon l-icon-alert'></span>
</span>
<span class='title-label'>
{{model.name}}
<span>{{model.location}}</span>
<span>{{location.getLocation()}}</span>
<span ng-show="{{location.isLink}}">(link)</span>
</span>
</span>