diff --git a/app/assets/javascripts/admin/templates/logs/blocked_emails.js.handlebars b/app/assets/javascripts/admin/templates/logs/blocked_emails.js.handlebars index 9da0ba1f8c6..80881573a6e 100644 --- a/app/assets/javascripts/admin/templates/logs/blocked_emails.js.handlebars +++ b/app/assets/javascripts/admin/templates/logs/blocked_emails.js.handlebars @@ -7,7 +7,7 @@
- +
{{i18n admin.logs.action}}
{{i18n admin.logs.blocked_emails.match_count}}
{{i18n admin.logs.blocked_emails.last_match_at}}
diff --git a/app/assets/javascripts/admin/templates/logs/blocked_emails_list_item.js.handlebars b/app/assets/javascripts/admin/templates/logs/blocked_emails_list_item.js.handlebars index 4e364079647..d5fe552918d 100644 --- a/app/assets/javascripts/admin/templates/logs/blocked_emails_list_item.js.handlebars +++ b/app/assets/javascripts/admin/templates/logs/blocked_emails_list_item.js.handlebars @@ -1,4 +1,4 @@ - +
{{actionName}}
{{match_count}}
{{unboundAgeWithTooltip last_match_at}}
diff --git a/app/assets/javascripts/admin/templates/logs/staff_action_logs.js.handlebars b/app/assets/javascripts/admin/templates/logs/staff_action_logs.js.handlebars index 8cb22203f1a..3285811c361 100644 --- a/app/assets/javascripts/admin/templates/logs/staff_action_logs.js.handlebars +++ b/app/assets/javascripts/admin/templates/logs/staff_action_logs.js.handlebars @@ -6,8 +6,8 @@
+
{{i18n admin.logs.staff_actions.staff_user}}
{{i18n admin.logs.action}}
-
{{i18n admin.logs.staff_actions.staff_user}}
{{i18n admin.logs.staff_actions.target_user}}
{{i18n admin.logs.staff_actions.when}}
{{i18n admin.logs.staff_actions.context}}
diff --git a/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.js.handlebars b/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.js.handlebars index 2604b7fc384..830c5759f1b 100644 --- a/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.js.handlebars +++ b/app/assets/javascripts/admin/templates/logs/staff_action_logs_list_item.js.handlebars @@ -1,10 +1,10 @@ - -
+
{{#linkTo 'adminUser' staff_user}}{{avatar staff_user imageSize="tiny"}}{{/linkTo}} {{#linkTo 'adminUser' staff_user}}{{staff_user.username}}{{/linkTo}}
+
{{#if target_user}} {{#linkTo 'adminUser' target_user}}{{avatar target_user imageSize="tiny"}}{{/linkTo}} diff --git a/app/assets/stylesheets/admin/admin_base.scss b/app/assets/stylesheets/admin/admin_base.scss index 46e7ad7810e..9f6ceb0a385 100644 --- a/app/assets/stylesheets/admin/admin_base.scss +++ b/app/assets/stylesheets/admin/admin_base.scss @@ -704,7 +704,6 @@ table { width: 900px; .email { width: 400px; - margin-left: 5px; } .action, .match_count, .last_match_at, .created_at { width: 110px; @@ -716,7 +715,6 @@ table { width: 100%; .action { width: 120px; - margin-left: 5px; } .staff_user, .target_user { width: 100px; @@ -771,6 +769,9 @@ table { overflow-y: auto; overflow-x: hidden; } + .col.first { + margin-left: 5px; + } .ember-list-item-view { width: 100%;