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

When flag is from system, don't show a user avatar. Say System: instead

This commit is contained in:
Neil Lalonde 2013-11-22 11:13:54 -05:00
parent 4c0642cbe1
commit 35bb4fc17f
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/assets/javascripts/admin/templates/flags.js.handlebars
View File

@ -56,10 +56,13 @@
<td></td> <td></td>
<td class='message'> <td class='message'>
<div> <div>
{{#link-to 'adminUser' user}}{{avatar user imageSize="small"}}{{/link-to}}
{{message}}
{{#unless bySystemUser}} {{#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> <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}} {{/unless}}
</div> </div>
</td> </td>

2
app/assets/stylesheets/common/admin/admin_base.scss
View File

@ -356,7 +356,7 @@ table {
tr.hidden-post td.excerpt { opacity: 0.4; } tr.hidden-post td.excerpt { opacity: 0.4; }
tr.deleted td.excerpt { opacity: 0.8; background-color: #ffcece; } tr.deleted td.excerpt { opacity: 0.8; background-color: #ffcece; }
td.message { td.message {
padding: 4px 0; padding: 4px 8px;
background-color: #f8f8e0; background-color: #f8f8e0;
} }
td { vertical-align: top; } td { vertical-align: top; }

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

@ -1147,6 +1147,7 @@ en:
delete_spammer_title: "Delete the user and all its posts and topics." delete_spammer_title: "Delete the user and all its posts and topics."
flagged_by: "Flagged by" flagged_by: "Flagged by"
system: "System"
error: "Something went wrong" error: "Something went wrong"
view_message: "Reply" view_message: "Reply"
no_results: "There are no flags." no_results: "There are no flags."