ExternalVendorCode/openmct
1
0
Fork 0
mirror of https://github.com/nasa/openmct.git synced 2025-06-17 06:38:17 +00:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Making changes to implement display queue

Browse Source
This commit is contained in:
Henry
2015-10-13 17:13:24 -07:00
parent b2a09599a0
commit 2ba6f18c59
7 changed files with 33 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
platform/commonUI/dialog/res/templates/message.html
View File

@ -1,7 +1,8 @@
<div ng-controller="MessageController" <div ng-controller="MessageController"
class="l-message" class="l-message"
title="{{MessageSeverity}}" title="{{MessageSeverity}}"
ng-class="{'message-severity-info': ngModel.severity===MessageSeverity.INFO, ng-class="{
'message-severity-info': ngModel.severity===MessageSeverity.INFO,
'message-severity-error': ngModel.severity===MessageSeverity.ERROR, 'message-severity-error': ngModel.severity===MessageSeverity.ERROR,
'message-severity-alert': ngModel.severity===MessageSeverity.ALERT}"> 'message-severity-alert': ngModel.severity===MessageSeverity.ALERT}">
<div class="ui-symbol type-icon message-type"></div> <div class="ui-symbol type-icon message-type"></div>

5
platform/commonUI/general/res/templates/message-banner.html
View File

@ -1,5 +1,8 @@
<div ng-controller="BannerController" ng-show="active.notification" <div ng-controller="BannerController" ng-show="active.notification"
class="l-message-banner s-message-banner" ng-click="maximize(active.notification)"> class="l-message-banner s-message-banner" ng-class="{
'error': highest.severity===MessageSeverity.ERROR,
'alert': highest.severity===MessageSeverity.ALERT }"
ng-click="maximize(active.notification)">
<span class="banner-elem label"> <span class="banner-elem label">
{{active.notification.title}} {{active.notification.title}}
</span> </span>

10
platform/commonUI/notification/res/notification-indicator.html
View File

@ -1,8 +1,12 @@
<span ng-show="notifications.length > 0" class="status block caution" <span ng-show="notifications.length > 0" class="status block"
ng-class="{
'error': highest.severity===MessageSeverity.ERROR,
'alert': highest.severity===MessageSeverity.ALERT }"
ng-controller="NotificationIndicatorController"> ng-controller="NotificationIndicatorController">
<span class="ui-symbol status-indicator">&#x21;</span> <span class="ui-symbol status-indicator">&#xe610;</span>
<span class="label"> <span class="label">
<a ng-click="showNotificationsList()">{{notifications.length}} Notifications</a> <a ng-click="showNotificationsList()">{{notifications.length}}
Notifications {{highest.severity}}</a>
</span> </span>
<span class="count">{{notifications.length}}</span> <span class="count">{{notifications.length}}</span>
</span> </span>

3
platform/commonUI/notification/src/NotificationIndicatorController.js
View File

@ -28,6 +28,9 @@ define(
function NotificationIndicatorController($scope, notificationService, dialogService) { function NotificationIndicatorController($scope, notificationService, dialogService) {
$scope.notifications = notificationService.notifications; $scope.notifications = notificationService.notifications;
$scope.highest = notificationService.highest;
$scope.MessageSeverity = MessageSeverity;
$scope.showNotificationsList = function(){ $scope.showNotificationsList = function(){
var model = { var model = {

2
platform/commonUI/notification/src/NotificationService.js
View File

@ -254,8 +254,8 @@ define(
var index = this.notifications.indexOf(notification); var index = this.notifications.indexOf(notification);
if (index >= 0) { if (index >= 0) {
this.notifications.splice(index, 1); this.notifications.splice(index, 1);
this.setActiveNotification(this.selectNextNotification());
} }
this.setActiveNotification(this.selectNextNotification());
}; };
/** /**

1
testing/dialogTest/res/notification-launch.html
View File

@ -3,6 +3,7 @@
<span class="label"> <span class="label">
<a ng-click="newSuccess()">Success</a> | <a ng-click="newSuccess()">Success</a> |
<a ng-click="newError()">Error</a> | <a ng-click="newError()">Error</a> |
<a ng-click="newAlert()">Alert</a> |
<a ng-click="newProgress()">Progress</a> <a ng-click="newProgress()">Progress</a>
</span> </span>
<span class="count">Notifications</span> <span class="count">Notifications</span>

15
testing/dialogTest/src/NotificationLaunchController.js
View File

@ -96,6 +96,21 @@ define(
actions: getExampleActions()}); actions: getExampleActions()});
}; };
$scope.newAlert = function(){
notificationService.notify({
title: "Error notification " + messageCounter++ + "!",
hint: "An error has occurred",
severity: MessageSeverity.ALERT,
primaryAction: {
label: 'Retry',
action: function() {
console.log('Retry clicked');
}
},
actions: getExampleActions()});
};
$scope.newProgress = function(){ $scope.newProgress = function(){
var notification = { var notification = {