diff --git a/app/assets/javascripts/discourse/components/discourse-action-history.js.es6 b/app/assets/javascripts/discourse/components/discourse-action-history.js.es6 index 0f751664d..6e089d909 100644 --- a/app/assets/javascripts/discourse/components/discourse-action-history.js.es6 +++ b/app/assets/javascripts/discourse/components/discourse-action-history.js.es6 @@ -62,7 +62,7 @@ export default Em.Component.extend({ var post = this.get('post'); if (post.get('deleted')) { buffer.push("
" + - I18n.t("post.deleted_by") + " " + + " " + Discourse.Utilities.tinyAvatar(post.get('postDeletedBy.avatar_template'), {title: post.get('postDeletedBy.username')}) + Discourse.Formatter.autoUpdatingRelativeAge(new Date(post.get('postDeletedAt'))) + "
"); diff --git a/app/assets/javascripts/discourse/templates/user/posts.js.handlebars b/app/assets/javascripts/discourse/templates/user/posts.js.handlebars index 9c1522d30..8e94b3198 100644 --- a/app/assets/javascripts/discourse/templates/user/posts.js.handlebars +++ b/app/assets/javascripts/discourse/templates/user/posts.js.handlebars @@ -17,8 +17,8 @@ {{descriptionHtml}} {{#if deleted}} - - {{i18n post.deleted_by}} {{avatar deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}} {{date path="deleted_at" leaveAgo="true"}} + + {{avatar deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}} {{date path="deleted_at" leaveAgo="true"}} {{/if}} diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss index 2fe9c1ef7..48feea29d 100644 --- a/app/assets/stylesheets/desktop/user.scss +++ b/app/assets/stylesheets/desktop/user.scss @@ -321,13 +321,16 @@ span.name { color: $primary; } - .time { + .time, .delete-info { display: block; float: right; color: $primary; margin-right: 8px; font-size: 11px; } + .delete-info i { + font-size: 14px; + } .avatar-link { float: left; margin-right: 4px; diff --git a/app/assets/stylesheets/mobile/user.scss b/app/assets/stylesheets/mobile/user.scss index 34b28013a..86839c291 100644 --- a/app/assets/stylesheets/mobile/user.scss +++ b/app/assets/stylesheets/mobile/user.scss @@ -226,13 +226,16 @@ span.name { color: scale-color($primary, $lightness: 50%); } - .time { + .time, .delete-info { display: block; float: right; color: $primary; margin-right: 8px; font-size: 11px; } + .delete-info i { + font-size: 14px; + } .avatar-link { float: left; margin-right: 10px; diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml index cfc33866a..e88678523 100644 --- a/config/locales/client.en.yml +++ b/config/locales/client.en.yml @@ -980,7 +980,6 @@ en: deleted_by_author: 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)" - deleted_by: "deleted by" expand_collapse: "expand/collapse" gap: one: "1 post hidden"