Use toastr notifications instead of statusBarSet()

This commit is contained in:
2017-10-02 19:31:52 +02:00
parent 9870979c54
commit d3cd6a884e
6 changed files with 29 additions and 34 deletions

View File

@@ -155,7 +155,7 @@ script(type="text/javascript").
var $file = $('.form-group.file #file');
if ($file.val() == '') {
$file.addClass('error');
statusBarSet('error', 'No File Selected', 'pi-warning', 5000);
toastr.error('No file selected');
return jQuery.Deferred().reject("nofile");
}
@@ -173,10 +173,9 @@ script(type="text/javascript").
.fail(function(data){
/* Something went wrong, print it */
if (data.status == 422) {
statusBarSet('error', 'The submitted data could not be validated.', 'pi-warning', 8000);
toastr.error('The submitted data could not be validated');
} else {
statusBarSet('error', "Error! We've been notified and are working on it - "
+ data.status + ' ' + data.statusText, 'pi-warning', 8000);
toastr.error(data.status + ' ' + data.statusText, 'Error saving');
}
$("li.button-save").addClass('field-error');
@@ -196,7 +195,7 @@ script(type="text/javascript").
{% if is_embedded_edit %}
/* Load content*/
$('#project_context').html(dataHtml);
statusBarSet('success', 'Saved Successfully', 'pi-check');
toastr.success('Saved!');
/* Style button */
$("li.button-save").removeClass('saving field-error');

View File

@@ -112,10 +112,8 @@ script.
.addClass('processing');
var item_url = '/o/' + item_id;
statusBarSet('default', 'Loading organization…');
$.get(item_url, function(item_data) {
statusBarClear();
$('#item-details').html(item_data);
current_item
@@ -129,7 +127,7 @@ script.
}
current_item.removeClass(clean_classes);
statusBarSet('error', 'Failed to open organization', 'pi-warning');
toastr.error('Failed to open organization');
if (xhr.status) {
$('#item-details').html(xhr.responseText);

View File

@@ -245,7 +245,7 @@ script.
})
.done(function (data) {
setTimeout(function(){ $('.sharing-users-item').removeClass('added');}, 350);
statusBarSet('success', 'Member added to this organization!', 'pi-grin');
toastr.success('Member added to this organization!');
// TODO fsiddi: avoid the reloading of the entire page?
window.location.reload();

View File

@@ -79,7 +79,7 @@ script.
if ($found.length) {
$found.addClass('active');
setTimeout(function(){ $('.sharing-users-item').removeClass('active');}, 350);
statusBarSet('info', 'User is already part of the project', 'pi-info');
toastr.info('User is already part of the project');
return;
}
@@ -95,7 +95,7 @@ script.
});
function addUser(userId){
if (!userId || userId.length == 0) {
statusBarSet('error', 'Please select a user from the list', 'pi-warning');
toastr.warning('Please select a user from the list');
return;
}
@@ -137,11 +137,11 @@ script.
$('<i>').addClass('pi-trash').appendTo($button);
setTimeout(function(){ $('.sharing-users-item').removeClass('added');}, 350);
statusBarSet('success', 'User added to this project!', 'pi-grin');
toastr.success('User added to this project!');
})
.fail(function (jsxhr){
data = jsxhr.responseJSON;
statusBarSet('error', 'Could not add user (' + data.message + ')', 'pi-warning');
toastr.error(data.message, 'Could not add user');
});
}
@@ -158,10 +158,10 @@ script.
{user_id: userId, action: 'remove'})
.done(function (data) {
$("ul.sharing-users-list").find("[user-id='" + userId + "']").remove();
statusBarSet('success', 'User removed from this project', 'pi-trash');
toastr.success('User removed from this project');
})
.fail(function (data){
statusBarSet('error', 'Could not remove user (' + data._status + ')', 'pi-warning');
toastr.error(data._status, 'Could not remove user');
});
}
});