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

Put staff user in the first column

This commit is contained in:
Neil Lalonde 2013-08-09 11:24:50 -04:00
parent 90a3bcf6ff
commit 4d8585ac10
5 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/assets/javascripts/admin/templates/logs/blocked_emails.js.handlebars
View File

@ -7,7 +7,7 @@
<div class='table blocked-emails'> <div class='table blocked-emails'>
<div class="heading-container"> <div class="heading-container">
<div class="col heading email">{{i18n admin.logs.blocked_emails.email}}</div> <div class="col heading first email">{{i18n admin.logs.blocked_emails.email}}</div>
<div class="col heading action">{{i18n admin.logs.action}}</div> <div class="col heading action">{{i18n admin.logs.action}}</div>
<div class="col heading match_count">{{i18n admin.logs.blocked_emails.match_count}}</div> <div class="col heading match_count">{{i18n admin.logs.blocked_emails.match_count}}</div>
<div class="col heading last_match_at">{{i18n admin.logs.blocked_emails.last_match_at}}</div> <div class="col heading last_match_at">{{i18n admin.logs.blocked_emails.last_match_at}}</div>

2
app/assets/javascripts/admin/templates/logs/blocked_emails_list_item.js.handlebars
View File

@ -1,4 +1,4 @@
<div class="col email">{{email}}</div> <div class="col first email">{{email}}</div>
<div class="col action">{{actionName}}</div> <div class="col action">{{actionName}}</div>
<div class="col match_count">{{match_count}}</div> <div class="col match_count">{{match_count}}</div>
<div class="col last_match_at">{{unboundAgeWithTooltip last_match_at}}</div> <div class="col last_match_at">{{unboundAgeWithTooltip last_match_at}}</div>

2
app/assets/javascripts/admin/templates/logs/staff_action_logs.js.handlebars
View File

@ -6,8 +6,8 @@
<div class='table staff-actions'> <div class='table staff-actions'>
<div class="heading-container"> <div class="heading-container">
<div class="col heading first staff_user">{{i18n admin.logs.staff_actions.staff_user}}</div>
<div class="col heading action">{{i18n admin.logs.action}}</div> <div class="col heading action">{{i18n admin.logs.action}}</div>
<div class="col heading staff_user">{{i18n admin.logs.staff_actions.staff_user}}</div>
<div class="col heading target_user">{{i18n admin.logs.staff_actions.target_user}}</div> <div class="col heading target_user">{{i18n admin.logs.staff_actions.target_user}}</div>
<div class="col heading created_at">{{i18n admin.logs.staff_actions.when}}</div> <div class="col heading created_at">{{i18n admin.logs.staff_actions.when}}</div>
<div class="col heading context">{{i18n admin.logs.staff_actions.context}}</div> <div class="col heading context">{{i18n admin.logs.staff_actions.context}}</div>

8
app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.js.handlebars
View File

@ -1,10 +1,10 @@
<div class="col value action"> <div class="col value first staff_user">
<a {{action filterByAction action_name}}>{{actionName}}</a>
</div>
<div class="col value staff_user">
{{#linkTo 'adminUser' staff_user}}{{avatar staff_user imageSize="tiny"}}{{/linkTo}} {{#linkTo 'adminUser' staff_user}}{{avatar staff_user imageSize="tiny"}}{{/linkTo}}
{{#linkTo 'adminUser' staff_user}}{{staff_user.username}}{{/linkTo}} {{#linkTo 'adminUser' staff_user}}{{staff_user.username}}{{/linkTo}}
</div> </div>
<div class="col value action">
<a {{action filterByAction action_name}}>{{actionName}}</a>
</div>
<div class="col value target_user"> <div class="col value target_user">
{{#if target_user}} {{#if target_user}}
{{#linkTo 'adminUser' target_user}}{{avatar target_user imageSize="tiny"}}{{/linkTo}} {{#linkTo 'adminUser' target_user}}{{avatar target_user imageSize="tiny"}}{{/linkTo}}

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

@ -704,7 +704,6 @@ table {
width: 900px; width: 900px;
.email { .email {
width: 400px; width: 400px;
margin-left: 5px;
} }
.action, .match_count, .last_match_at, .created_at { .action, .match_count, .last_match_at, .created_at {
width: 110px; width: 110px;
@ -716,7 +715,6 @@ table {
width: 100%; width: 100%;
.action { .action {
width: 120px; width: 120px;
margin-left: 5px;
} }
.staff_user, .target_user { .staff_user, .target_user {
width: 100px; width: 100px;
@ -771,6 +769,9 @@ table {
overflow-y: auto; overflow-y: auto;
overflow-x: hidden; overflow-x: hidden;
} }
.col.first {
margin-left: 5px;
}
.ember-list-item-view { .ember-list-item-view {
width: 100%; width: 100%;