Merge open155 > github/master

open155 open186 Trying a third time to resolve conflicts between open155 and master;
2015-10-30 16:20:57 -07:00
parent ec56fe7bfd
commit 1e6731e6f2
52 changed files with 5594 additions and 3151 deletions
--- a/platform/commonUI/notification/res/notification-indicator.html
+++ b/platform/commonUI/notification/res/notification-indicator.html
@@ -0,0 +1,10 @@
+<span ng-show="notifications.length > 0" class="status block"
+      ng-class="highest.severity"
+      ng-controller="NotificationIndicatorController">
+    <span class="ui-symbol status-indicator">&#xe610;</span>
+    <span class="label">
+        <a ng-click="showNotificationsList()">{{notifications.length}}
+            Notifications</a>
+    </span>
+    <span class="count">{{notifications.length}}</span>
+</span>