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

FEATURE: replace 'deleted by' with the trashcan glyph

This commit is contained in:
Régis Hanol 2014-07-16 22:38:39 +02:00
parent 5c70d878a7
commit f43293a7bc
5 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/discourse/components/discourse-action-history.js.es6
View File

@ -62,7 +62,7 @@ export default Em.Component.extend({
var post = this.get('post'); var post = this.get('post');
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") + " " + "<i class='fa fa-trash-o'></i>&nbsp;" +
Discourse.Utilities.tinyAvatar(post.get('postDeletedBy.avatar_template'), {title: post.get('postDeletedBy.username')}) + 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>");

4
app/assets/javascripts/discourse/templates/user/posts.js.handlebars
View File

@ -17,8 +17,8 @@
{{descriptionHtml}} {{descriptionHtml}}
</span> </span>
{{#if deleted}} {{#if deleted}}
<span class="time"> <span class="delete-info">
{{i18n post.deleted_by}} {{avatar deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}} {{date path="deleted_at" leaveAgo="true"}} <i class="fa fa-trash-o"></i> {{avatar deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}} {{date path="deleted_at" leaveAgo="true"}}
</span> </span>
{{/if}} {{/if}}
</div> </div>

5
app/assets/stylesheets/desktop/user.scss
View File

@ -321,13 +321,16 @@
span.name { span.name {
color: $primary; color: $primary;
} }
.time { .time, .delete-info {
display: block; display: block;
float: right; float: right;
color: $primary; color: $primary;
margin-right: 8px; margin-right: 8px;
font-size: 11px; font-size: 11px;
} }
.delete-info i {
font-size: 14px;
}
.avatar-link { .avatar-link {
float: left; float: left;
margin-right: 4px; margin-right: 4px;

5
app/assets/stylesheets/mobile/user.scss
View File

@ -226,13 +226,16 @@
span.name { span.name {
color: scale-color($primary, $lightness: 50%); color: scale-color($primary, $lightness: 50%);
} }
.time { .time, .delete-info {
display: block; display: block;
float: right; float: right;
color: $primary; color: $primary;
margin-right: 8px; margin-right: 8px;
font-size: 11px; font-size: 11px;
} }
.delete-info i {
font-size: 14px;
}
.avatar-link { .avatar-link {
float: left; float: left;
margin-right: 10px; margin-right: 10px;

1
config/locales/client.en.yml
View File

@ -980,7 +980,6 @@ en:
deleted_by_author: deleted_by_author:
one: "(post withdrawn by author, will be automatically deleted in %{count} hour unless flagged)" one: "(post withdrawn by author, will be automatically deleted in %{count} hour unless flagged)"
other: "(post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)" other: "(post withdrawn by author, will be automatically deleted in %{count} hours unless flagged)"
deleted_by: "deleted by"
expand_collapse: "expand/collapse" expand_collapse: "expand/collapse"
gap: gap:
one: "1 post hidden" one: "1 post hidden"