[Representations] grid-item and label display links

grid-item and label representations now use the "location" capability
to determine whether or not to show a link indicator.
This commit is contained in:
Pete Richards 2015-08-06 09:49:50 -07:00
parent 19b80ded16
commit ec62c27f36
3 changed files with 11 additions and 13 deletions

View File

@ -69,8 +69,8 @@
{ {
"key": "grid-item", "key": "grid-item",
"templateUrl": "templates/items/grid-item.html", "templateUrl": "templates/items/grid-item.html",
"uses": [ "type", "action" ], "uses": [ "type", "action", "location" ],
"gestures": [ "info","menu" ] "gestures": [ "info", "menu" ]
}, },
{ {
"key": "object-header", "key": "object-header",
@ -88,12 +88,12 @@
{ {
"key": "navigationService", "key": "navigationService",
"implementation": "navigation/NavigationService.js" "implementation": "navigation/NavigationService.js"
}, },
{ {
"key": "creationService", "key": "creationService",
"implementation": "creation/CreationService.js", "implementation": "creation/CreationService.js",
"depends": [ "persistenceService", "$q", "$log" ] "depends": [ "persistenceService", "$q", "$log" ]
} }
], ],
"actions": [ "actions": [
{ {

View File

@ -34,11 +34,10 @@
<div class='item-main abs'> <div class='item-main abs'>
<div class='ui-symbol icon lg item-type'> <div class='ui-symbol icon lg item-type'>
{{type.getGlyph()}} {{type.getGlyph()}}
<!-- this will be toggled by a ng-show -->
<span <span
class='ui-symbol icon l-icon-link' title="This object is a link" class="ui-symbol icon l-icon-link" title="This object is a link"
ng-show = "true" ng-show="location.isLink()"
></span> ></span>
</div> </div>
<div class='ui-symbol icon abs item-open'>}</div> <div class='ui-symbol icon abs item-open'>}</div>
</div> </div>
@ -51,4 +50,4 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>

View File

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