Nemcio/NodeBB
1
0
Fork 0
mirror of https://github.com/NodeBB/NodeBB.git synced 2025-11-06 22:15:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

closes #1684

Browse Source
This commit is contained in:
barisusakli
2014-06-13 13:57:38 -04:00
parent 8402c3edc3
commit ce1934e566
6 changed files with 11 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
public/language/en_GB/notifications.json
View File

@@ -17,6 +17,7 @@
"favourited_your_post": "<strong>%1</strong> has favourited your post.", "favourited_your_post": "<strong>%1</strong> has favourited your post.",
"user_flagged_post": "<strong>%1</strong> flagged a post.", "user_flagged_post": "<strong>%1</strong> flagged a post.",
"user_posted_to" : "<strong>%1</strong> has posted a reply to: <strong>%2</strong>", "user_posted_to" : "<strong>%1</strong> has posted a reply to: <strong>%2</strong>",
"user_mentioned_you_in": "<strong>%1</strong> mentioned you in <strong>%2</strong>",
"email-confirmed": "Email Confirmed", "email-confirmed": "Email Confirmed",
"email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.", "email-confirmed-message": "Thank you for validating your email. Your account is now fully activated.",

3
public/src/modules/chat.js
View File

@@ -216,7 +216,8 @@ define('chat', ['taskbar', 'string', 'sounds'], function(taskbar, S, sounds) {
taskbar.push('chat', chatModal.attr('UUID'), { taskbar.push('chat', chatModal.attr('UUID'), {
title:'<i class="fa fa-comment"></i> ' + username, title: username,
icon: 'fa-comment',
state: '' state: ''
}); });

3
public/src/modules/composer.js
View File

@@ -59,8 +59,7 @@ define('composer', ['taskbar', 'composer/controls', 'composer/uploads', 'compose
translator.translate('[[topic:composer.new_topic]]', function(newTopicStr) { translator.translate('[[topic:composer.new_topic]]', function(newTopicStr) {
taskbar.push('composer', uuid, { taskbar.push('composer', uuid, {
title: post.title ? post.title : newTopicStr, title: post.title ? post.title : newTopicStr
icon: post.picture
}); });
}); });

2
public/src/modules/notifications.js
View File

@@ -24,7 +24,7 @@ define('notifications', ['sounds'], function(sound) {
} else { } else {
image = ''; image = '';
} }
notification.text = $('<div/>').text(notification.text).html();
return '<li class="' + (notification.readClass || '') + '"><a href="' + (notification.path || '#') + '">' + image + '<span class="pull-right relTime">' + utils.relativeTime(notification.datetime, true) + '</span><span class="text">' + notification.text + '</span></a></li>'; return '<li class="' + (notification.readClass || '') + '"><a href="' + (notification.path || '#') + '">' + image + '<span class="pull-right relTime">' + utils.relativeTime(notification.datetime, true) + '</span><span class="text">' + notification.text + '</span></a></li>';
} }

6
public/src/modules/taskbar.js
View File

@@ -58,13 +58,15 @@ define('taskbar', function() {
push: function(module, uuid, options) { push: function(module, uuid, options) {
var element = taskbar.tasklist.find('li[data-uuid="'+uuid+'"]'); var element = taskbar.tasklist.find('li[data-uuid="'+uuid+'"]');
if(element.length) if(element.length) {
return; return;
}
var title = $('<div></div>').text(options.title || 'NodeBB Task').html(); var title = $('<div></div>').text(options.title || 'NodeBB Task').html();
var btnEl = $('<li />') var btnEl = $('<li />')
.html('<a href="#">' + .html('<a href="#">' +
(options.icon ? '<img src="' + options.icon + '" />' : '') + (options.icon ? '<i class="fa ' + options.icon + '"></i> ' : '') +
(options.image ? '<img src="' + options.image + '"/> ': '') +
'<span>' + title + '</span>' + '<span>' + title + '</span>' +
'</a>') '</a>')
.attr({ .attr({

2
src/notifications.js
View File

@@ -4,6 +4,7 @@ var async = require('async'),
winston = require('winston'), winston = require('winston'),
cron = require('cron').CronJob, cron = require('cron').CronJob,
nconf = require('nconf'), nconf = require('nconf'),
validator = require('validator'),
db = require('./database'), db = require('./database'),
utils = require('../public/src/utils'), utils = require('../public/src/utils'),
@@ -33,6 +34,7 @@ var async = require('async'),
db.getObjectFields('notifications:' + nid, ['nid', 'from', 'text', 'image', 'importance', 'score', 'path', 'datetime', 'uniqueId'], function(err, notification) { db.getObjectFields('notifications:' + nid, ['nid', 'from', 'text', 'image', 'importance', 'score', 'path', 'datetime', 'uniqueId'], function(err, notification) {
notification.read = rank !== null ? true:false; notification.read = rank !== null ? true:false;
notification.text = validator.escape(notification.text);
if (notification.from && !notification.image) { if (notification.from && !notification.image) {
User.getUserField(notification.from, 'picture', function(err, picture) { User.getUserField(notification.from, 'picture', function(err, picture) {