mirror of
https://github.com/NodeBB/NodeBB.git
synced 2025-11-12 00:45:47 +01:00
fixed alert-notify (and blanks) to alert-warning
This commit is contained in:
@@ -72,7 +72,7 @@ var socket,
|
|||||||
alert_id: 'connection_alert',
|
alert_id: 'connection_alert',
|
||||||
title: 'Reconnecting',
|
title: 'Reconnecting',
|
||||||
message: 'You have disconnected from NodeBB, we will try to reconnect you. <br/><i class="icon-refresh icon-spin"></i>',
|
message: 'You have disconnected from NodeBB, we will try to reconnect you. <br/><i class="icon-refresh icon-spin"></i>',
|
||||||
type: 'notify',
|
type: 'warning',
|
||||||
timeout: 5000
|
timeout: 5000
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
@@ -161,7 +161,7 @@ var socket,
|
|||||||
if(alert.length > 0) {
|
if(alert.length > 0) {
|
||||||
alert.find('strong').html(params.title);
|
alert.find('strong').html(params.title);
|
||||||
alert.find('p').html(params.message);
|
alert.find('p').html(params.message);
|
||||||
alert.attr('class', "alert toaster-alert " + ((params.type=='warning') ? '' : "alert-" + params.type));
|
alert.attr('class', "alert toaster-alert " + "alert-" + params.type);
|
||||||
|
|
||||||
clearTimeout(alert.attr('timeoutId'));
|
clearTimeout(alert.attr('timeoutId'));
|
||||||
startTimeout(alert, params.timeout);
|
startTimeout(alert, params.timeout);
|
||||||
@@ -175,7 +175,7 @@ var socket,
|
|||||||
p.innerHTML = params.message;
|
p.innerHTML = params.message;
|
||||||
strong.innerHTML = params.title;
|
strong.innerHTML = params.title;
|
||||||
|
|
||||||
div.className = "alert toaster-alert " + ((params.type=='warning') ? '' : "alert-" + params.type);
|
div.className = "alert toaster-alert " + "alert-" + params.type;
|
||||||
|
|
||||||
div.setAttribute('id', alert_id);
|
div.setAttribute('id', alert_id);
|
||||||
div.appendChild(button);
|
div.appendChild(button);
|
||||||
|
|||||||
@@ -21,7 +21,7 @@ var nodebb_admin = nodebb_admin || {};
|
|||||||
alert_id: 'plugin_toggled_' + status.id,
|
alert_id: 'plugin_toggled_' + status.id,
|
||||||
title: 'Plugin Enabled',
|
title: 'Plugin Enabled',
|
||||||
message: 'You may need to restart NodeBB in order for these changes to be reflected.',
|
message: 'You may need to restart NodeBB in order for these changes to be reflected.',
|
||||||
type: 'notify',
|
type: 'warning',
|
||||||
timeout: 5000
|
timeout: 5000
|
||||||
})
|
})
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -6,7 +6,7 @@
|
|||||||
user_label = document.getElementById('user_label'),
|
user_label = document.getElementById('user_label'),
|
||||||
active_record = document.getElementById('active_record'),
|
active_record = document.getElementById('active_record'),
|
||||||
right_menu = document.getElementById('right-menu');
|
right_menu = document.getElementById('right-menu');
|
||||||
|
|
||||||
socket.emit('user.count', {});
|
socket.emit('user.count', {});
|
||||||
socket.on('user.count', function(data) {
|
socket.on('user.count', function(data) {
|
||||||
num_users.innerHTML = "We currently have <b>" + data.count + "</b> registered users.";
|
num_users.innerHTML = "We currently have <b>" + data.count + "</b> registered users.";
|
||||||
@@ -28,22 +28,22 @@
|
|||||||
|
|
||||||
socket.emit('api:user.active.get');
|
socket.emit('api:user.active.get');
|
||||||
socket.on('api:user.active.get', function(data) {
|
socket.on('api:user.active.get', function(data) {
|
||||||
|
|
||||||
var plural_users = parseInt(data.users) !== 1,
|
var plural_users = parseInt(data.users) !== 1,
|
||||||
plural_anon = parseInt(data.anon) !== 1;
|
plural_anon = parseInt(data.anon) !== 1;
|
||||||
|
|
||||||
active_users.innerHTML = 'There ' + (plural_users ? 'are' : 'is') + ' <strong>' + data.users + '</strong> user' + (plural_users ? 's' : '') + ' and <strong>' + data.anon + '</strong> guest' + (plural_anon ? 's' : '') + ' online';
|
active_users.innerHTML = 'There ' + (plural_users ? 'are' : 'is') + ' <strong>' + data.users + '</strong> user' + (plural_users ? 's' : '') + ' and <strong>' + data.anon + '</strong> guest' + (plural_anon ? 's' : '') + ' online';
|
||||||
});
|
});
|
||||||
|
|
||||||
socket.emit('api:user.active.get_record');
|
socket.emit('api:user.active.get_record');
|
||||||
socket.on('api:user.active.get_record', function(data) {
|
socket.on('api:user.active.get_record', function(data) {
|
||||||
active_record.innerHTML = "most users ever online was <strong>" + data.record + "</strong> on <strong>" + (new Date(parseInt(data.timestamp,10))).toUTCString() + "</strong>";
|
active_record.innerHTML = "most users ever online was <strong>" + data.record + "</strong> on <strong>" + (new Date(parseInt(data.timestamp,10))).toUTCString() + "</strong>";
|
||||||
});
|
});
|
||||||
|
|
||||||
socket.emit('api:updateHeader', { fields: ['username', 'picture', 'userslug'] });
|
socket.emit('api:updateHeader', { fields: ['username', 'picture', 'userslug'] });
|
||||||
|
|
||||||
socket.on('api:updateHeader', function(data) {
|
socket.on('api:updateHeader', function(data) {
|
||||||
|
|
||||||
var rightMenu = $('#right-menu'),
|
var rightMenu = $('#right-menu'),
|
||||||
isLoggedIn = data.uid > 0;
|
isLoggedIn = data.uid > 0;
|
||||||
|
|
||||||
@@ -149,7 +149,7 @@
|
|||||||
app.alert({
|
app.alert({
|
||||||
title: 'New notification',
|
title: 'New notification',
|
||||||
message: 'You have unread notifications.',
|
message: 'You have unread notifications.',
|
||||||
type: 'notify',
|
type: 'warning',
|
||||||
timeout: 2000
|
timeout: 2000
|
||||||
});
|
});
|
||||||
utils.refreshTitle();
|
utils.refreshTitle();
|
||||||
@@ -160,12 +160,12 @@
|
|||||||
var username = data.username;
|
var username = data.username;
|
||||||
var fromuid = data.fromuid;
|
var fromuid = data.fromuid;
|
||||||
var message = data.message;
|
var message = data.message;
|
||||||
|
|
||||||
require(['chat'], function(chat) {
|
require(['chat'], function(chat) {
|
||||||
var chatModal = chat.createModalIfDoesntExist(username, fromuid);
|
var chatModal = chat.createModalIfDoesntExist(username, fromuid);
|
||||||
chatModal.show();
|
chatModal.show();
|
||||||
chat.bringModalToTop(chatModal);
|
chat.bringModalToTop(chatModal);
|
||||||
|
|
||||||
chat.appendChatMessage(chatModal, message);
|
chat.appendChatMessage(chatModal, message);
|
||||||
});
|
});
|
||||||
});
|
});
|
||||||
|
|||||||
@@ -340,7 +340,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
|
|||||||
socket.emit('event:alert', {
|
socket.emit('event:alert', {
|
||||||
title: 'Thank you for posting',
|
title: 'Thank you for posting',
|
||||||
message: 'You have successfully posted. Click here to view your post.',
|
message: 'You have successfully posted. Click here to view your post.',
|
||||||
type: 'notify',
|
type: 'warning',
|
||||||
timeout: 2000
|
timeout: 2000
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -379,7 +379,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
|
|||||||
socket.emit('event:alert', {
|
socket.emit('event:alert', {
|
||||||
title: 'Reply Unsuccessful',
|
title: 'Reply Unsuccessful',
|
||||||
message: 'Your reply could not be posted at this time. Please try again later.',
|
message: 'Your reply could not be posted at this time. Please try again later.',
|
||||||
type: 'notify',
|
type: 'warning',
|
||||||
timeout: 2000
|
timeout: 2000
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
@@ -393,7 +393,7 @@ var SocketIO = require('socket.io').listen(global.server, { log:false }),
|
|||||||
socket.emit('event:alert', {
|
socket.emit('event:alert', {
|
||||||
title: 'Reply Successful',
|
title: 'Reply Successful',
|
||||||
message: 'You have successfully replied. Click here to view your reply.',
|
message: 'You have successfully replied. Click here to view your reply.',
|
||||||
type: 'notify',
|
type: 'warning',
|
||||||
timeout: 2000
|
timeout: 2000
|
||||||
});
|
});
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user