From f43293a7bc424424e29d9444a2bcee2fab8ed953 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?R=C3=A9gis=20Hanol?= <regis@hanol.fr>
Date: Wed, 16 Jul 2014 22:38:39 +0200
Subject: [PATCH] FEATURE: replace 'deleted by' with the trashcan glyph

---
 .../discourse/components/discourse-action-history.js.es6     | 2 +-
 .../javascripts/discourse/templates/user/posts.js.handlebars | 4 ++--
 app/assets/stylesheets/desktop/user.scss                     | 5 ++++-
 app/assets/stylesheets/mobile/user.scss                      | 5 ++++-
 config/locales/client.en.yml                                 | 1 -
 5 files changed, 11 insertions(+), 6 deletions(-)

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 0f751664d89..6e089d90935 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("<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.Formatter.autoUpdatingRelativeAge(new Date(post.get('postDeletedAt'))) +
                   "</div>");
diff --git a/app/assets/javascripts/discourse/templates/user/posts.js.handlebars b/app/assets/javascripts/discourse/templates/user/posts.js.handlebars
index 9c1522d30e9..8e94b3198e6 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}}
       </span>
       {{#if deleted}}
-        <span class="time">
-          {{i18n post.deleted_by}} {{avatar deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}} {{date path="deleted_at" leaveAgo="true"}}
+        <span class="delete-info">
+          <i class="fa fa-trash-o"></i> {{avatar deleted_by imageSize="tiny" extraClasses="actor" ignoreTitle="true"}} {{date path="deleted_at" leaveAgo="true"}}
         </span>
       {{/if}}
     </div>
diff --git a/app/assets/stylesheets/desktop/user.scss b/app/assets/stylesheets/desktop/user.scss
index 2fe9c1ef742..48feea29d24 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 34b28013ab7..86839c29185 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 cfc33866a5b..e886785238c 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"