From 35bb4fc17f4a7bedabdf6772e749df69bb6ff415 Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Fri, 22 Nov 2013 11:13:54 -0500
Subject: [PATCH] When flag is from system, don't show a user avatar. Say
System: instead
---
app/assets/javascripts/admin/templates/flags.js.handlebars | 7 +++++--
app/assets/stylesheets/common/admin/admin_base.scss | 2 +-
config/locales/client.en.yml | 1 +
3 files changed, 7 insertions(+), 3 deletions(-)
diff --git a/app/assets/javascripts/admin/templates/flags.js.handlebars b/app/assets/javascripts/admin/templates/flags.js.handlebars
index 59d531016..1c6d1e5a1 100644
--- a/app/assets/javascripts/admin/templates/flags.js.handlebars
+++ b/app/assets/javascripts/admin/templates/flags.js.handlebars
@@ -56,10 +56,13 @@
<td></td>
<td class='message'>
<div>
- {{#link-to 'adminUser' user}}{{avatar user imageSize="small"}}{{/link-to}}
- {{message}}
{{#unless bySystemUser}}
+ {{#link-to 'adminUser' user}}{{avatar user imageSize="small"}}{{/link-to}}
+ {{message}}
<a href="{{unbound permalink}}"><button class='btn'><i class="icon-reply"></i> {{i18n admin.flags.view_message}}</button></a>
+ {{else}}
+ <b>{{i18n admin.flags.system}}</b>:
+ {{message}}
{{/unless}}
</div>
</td>
diff --git a/app/assets/stylesheets/common/admin/admin_base.scss b/app/assets/stylesheets/common/admin/admin_base.scss
index 938ae07bc..8c1ff70dd 100644
--- a/app/assets/stylesheets/common/admin/admin_base.scss
+++ b/app/assets/stylesheets/common/admin/admin_base.scss
@@ -356,7 +356,7 @@ table {
tr.hidden-post td.excerpt { opacity: 0.4; }
tr.deleted td.excerpt { opacity: 0.8; background-color: #ffcece; }
td.message {
- padding: 4px 0;
+ padding: 4px 8px;
background-color: #f8f8e0;
}
td { vertical-align: top; }
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 56d184314..2b93bfb7e 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -1147,6 +1147,7 @@ en:
delete_spammer_title: "Delete the user and all its posts and topics."
flagged_by: "Flagged by"
+ system: "System"
error: "Something went wrong"
view_message: "Reply"
no_results: "There are no flags."