vbatts/quay
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update styling of feedback bar to use the alert styles and string builder

Browse source
This commit is contained in:
Joseph Schorr 2015-07-14 12:22:18 +03:00
parent dcf8922799
commit d74da9a3db
5 changed files with 36 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
static/js/directives/ui/feedback-bar.js
View file

@ -11,11 +11,13 @@ angular.module('quay').directive('feedbackBar', function () {
scope: {
'feedback': '=feedback'
},
controller: function($scope, $element, AvatarService, Config, UIService, $timeout) {
controller: function($scope, $element, AvatarService, Config, UIService, $timeout, StringBuilderService) {
$scope.viewCounter = 0;
$scope.formattedMessage = '';
$scope.$watch('feedback', function(feedback) {
if (feedback) {
$scope.formattedMessage = StringBuilderService.buildString(feedback.message, feedback.data || {}, 'span');
$scope.viewCounter++;
} else {
$scope.viewCounter = 0;

14
static/js/directives/ui/robots-manager.js
View file

@ -119,8 +119,11 @@ angular.module('quay').directive('robotsManager', function () {
created.repositories = [];
$scope.robots.push(created);
$scope.feedback = {
'kind': 'info',
'message': 'Robot account ' + name + ' was created'
'kind': 'success',
'message': 'Robot account {robot} was created',
'data': {
'robot': name
}
};
});
};
@ -132,8 +135,11 @@ angular.module('quay').directive('robotsManager', function () {
if (index >= 0) {
$scope.robots.splice(index, 1);
$scope.feedback = {
'kind': 'info',
'message': 'Robot account ' + info.name + ' was deleted'
'kind': 'success',
'message': 'Robot account {robot} was deleted',
'data': {
'robot': info.name
}
};
}
}, ApiService.errorDisplay('Cannot delete robot account'));

6
static/js/services/string-builder-service.js
View file

@ -39,7 +39,7 @@ angular.module('quay').factory('StringBuilderService', ['$sce', 'UtilService', f
return url;
};
stringBuilderService.buildString = function(value_or_func, metadata) {
stringBuilderService.buildString = function(value_or_func, metadata, opt_codetag) {
var fieldIcons = {
'inviter': 'user',
'username': 'user',
@ -108,7 +108,9 @@ angular.module('quay').factory('StringBuilderService', ['$sce', 'UtilService', f
markedDown = '<i class="fa ' + icon + '"></i>' + markedDown;
}
description = description.replace('{' + key + '}', '<code title="' + safe + '">' + markedDown + '</code>');
var codeTag = opt_codetag || 'code';
description = description.replace('{' + key + '}',
'<' + codeTag + ' title="' + safe + '">' + markedDown + '</' + codeTag + '>');
}
}
return $sce.trustAsHtml(description.replace('\n', '<br>'));