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

restructure /admin/flags rows a bit

This commit is contained in:
Jeff Atwood 2013-06-21 00:29:54 -07:00
parent 6de1e16595
commit a9c251e71a
3 changed files with 25 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -36,7 +36,22 @@
<td class='last-flagged'>{{date flag.lastFlagged}}</td>
<td class='action'>
</tr>
{{#each flag.messages}}
<tr>
<td></td>
<td class='message'>
<div>{{#linkTo 'adminUser' user}}{{avatar user imageSize="small"}}{{/linkTo}} {{message}} <a href="{{unbound permalink}}">{{i18n admin.flags.view_message}}</a></div>
</td>
<td></td>
<td></td>
</tr>
{{/each}}
{{/each}}
<tr>
<td colspan="4" class="action">
{{#if adminActiveFlagsView}}
{{#if flag.postHidden}}
<button title='{{i18n admin.flags.disagree_unhide_title}}' class='btn' {{action disagreeFlags flag}}><i class="icon-thumbs-down"></i> {{i18n admin.flags.disagree_unhide}}</button>
@ -48,21 +63,7 @@
<button title='{{i18n admin.flags.delete_post_title}}' class='btn' {{action deletePost flag}}><i class="icon-trash"></i> {{i18n admin.flags.delete_post}}</button>
{{/if}}
</td>
</tr>
{{#each flag.messages}}
<tr>
<td></td>
<td class='message'>
<div>{{#linkTo 'adminUser' user}}{{avatar user imageSize="small"}}{{/linkTo}} {{message}} <a href="{{unbound permalink}}">{{i18n admin.flags.view_message}}</a></div>
</td>
<td></td>
<td></td>
<td></td>
</tr>
{{/each}}
{{/each}}
</tbody>
</table>
{{else}}

5
app/assets/stylesheets/admin/admin_base.scss
View File

@ -279,7 +279,7 @@ table {
th { text-align: left; }
.user { width: 40px; }
.excerpt {
width: 600px; padding: 0 10px 10px 0;
width: 740px; padding: 0 10px 10px 0;
.icon,h3 { display: inline-block; }
}
@ -287,7 +287,8 @@ table {
.last-flagged { padding: 0 10px; }
.flag-summary { font-size: 11px; }
.action {
button { margin: 4px; display: block;}
button { margin: 4px; }
text-align: right;
padding-bottom: 20px;
}
}

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

@ -1034,16 +1034,16 @@ en:
old: "Old"
active: "Active"
agree_hide: "Agree (Hide + PM)"
agree_hide_title: "Agree with flags, hide post and send user a private message"
agree_hide: "Agree (hide post + send PM)"
agree_hide_title: "Hide this post and automatically send the user a private message urging them to edit it"
defer: "Defer"
defer_title: "Defer flag handling to the system"
defer_title: "No action is necessary at this time, defer any action on this flag until a later date, or never"
delete_post: "Delete Post"
delete_post_title: "delete post (if its the first post delete topic)"
disagree_unhide: "Disagree (Unhide)"
disagree_unhide_title: "Disagree with flag, remove flags from post and show post"
delete_post_title: "Delete post; if the first post, delete the topic"
disagree_unhide: "Disagree (unhide post)"
disagree_unhide_title: "Remove any flags from this post and make the post visible again"
disagree: "Disagree"
disagree_title: "Disagree with flag, remove flags from post"
disagree_title: "Disagree with flag, remove any flags from this post"
flagged_by: "Flagged by"
error: "Something went wrong"