Merging in latest openmctweb master

open74 Had to resolve conflicts
2015-08-20 10:36:41 -07:00
parent c4dd4f5c45 9c578c53db
commit b1e1e85bbd
42 changed files with 1441 additions and 605 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'>