Discource-C
/
discourse
mirror of https://github.com/discourse/discourse.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Show tooltip on avatar on deleted post

This commit is contained in:
Neil Lalonde 2014-01-27 16:52:22 -05:00
parent 359a866458
commit e0188d60c6
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/assets/javascripts/discourse/lib/utilities.js
View File

@ -56,8 +56,8 @@ Discourse.Utilities = {
return "<img width='" + size + "' height='" + size + "' src='" + url + "' class='" + classes + "'" + title + ">"; return "<img width='" + size + "' height='" + size + "' src='" + url + "' class='" + classes + "'" + title + ">";
}, },
tinyAvatar: function(avatarTemplate) { tinyAvatar: function(avatarTemplate, options) {
return Discourse.Utilities.avatarImg({avatarTemplate: avatarTemplate, size: 'tiny' }); return Discourse.Utilities.avatarImg(_.merge({avatarTemplate: avatarTemplate, size: 'tiny' }, options));
}, },
postUrl: function(slug, topicId, postNumber) { postUrl: function(slug, topicId, postNumber) {

2
app/assets/javascripts/discourse/views/actions_history_view.js
View File

@ -62,7 +62,7 @@ Discourse.ActionsHistoryComponent = Em.Component.extend({
if (post.get('deleted')) { if (post.get('deleted')) {
buffer.push("<div class='post-action'>" + buffer.push("<div class='post-action'>" +
I18n.t("post.deleted_by") + " " + I18n.t("post.deleted_by") + " " +
Discourse.Utilities.tinyAvatar(post.get('postDeletedBy.avatar_template')) + Discourse.Utilities.tinyAvatar(post.get('postDeletedBy.avatar_template'), {title: post.get('postDeletedBy.username')}) +
Discourse.Formatter.autoUpdatingRelativeAge(new Date(post.get('postDeletedAt'))) + Discourse.Formatter.autoUpdatingRelativeAge(new Date(post.get('postDeletedAt'))) +
"</div>"); "</div>");
} }