[Mobile] Merge

Merged with master and resolved conflicts.
2015-08-25 12:36:50 -07:00
parent aca06c6007 f1ca9ff15e
commit cd46dab5c1
294 changed files with 11631 additions and 9569 deletions
--- a/platform/commonUI/browse/res/templates/items/grid-item.html
+++ b/platform/commonUI/browse/res/templates/items/grid-item.html
@@ -32,7 +32,13 @@
            </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()}}
+                <span
+                    class="ui-symbol icon l-icon-link" title="This object is a link"
+                    ng-show="location.isLink()"
+                    ></span>
+            </div>
            <div class='ui-symbol icon abs item-open'>}</div>
        </div>
        <div class='bottom-bar bar abs'>