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

This commit is contained in:
Pete Richards
2015-08-06 15:10:52 -07:00
5 changed files with 28 additions and 19 deletions

View File

@@ -27,12 +27,19 @@
<mct-include key="_checkbox"></mct-include>
</div>
<div class='right abs'>
<div class='ui-symbol icon alert hidden' onclick="alert('Not yet functional. When this is visible, it means that this object needs to be updated. Clicking will allow that action via a dialog.');">!</div>
<div class='ui-symbol icon l-icon-alert'></div>
<div class='ui-symbol icon profile' title="Shared">P</div>
</div>
</div>
<div class='item-main abs'>
<div class='ui-symbol icon lg abs item-type'>{{type.getGlyph()}}</div>
<div class='ui-symbol icon lg item-type'>
{{type.getGlyph()}}
<!-- this will be toggled by a ng-show -->
<span
class='ui-symbol icon l-icon-link' title="This object is a link"
ng-show = "true"
></span>
</div>
<div class='ui-symbol icon abs item-open'>}</div>
</div>
<div class='bottom-bar bar abs'>