From 4d8585ac109f5c6cf52af53a5103d619023cac8b Mon Sep 17 00:00:00 2001
From: Neil Lalonde <neillalonde@gmail.com>
Date: Fri, 9 Aug 2013 11:24:50 -0400
Subject: [PATCH] Put staff user in the first column

---
 .../admin/templates/logs/blocked_emails.js.handlebars     | 2 +-
 .../templates/logs/blocked_emails_list_item.js.handlebars | 2 +-
 .../admin/templates/logs/staff_action_logs.js.handlebars  | 2 +-
 .../logs/staff_action_logs_list_item.js.handlebars        | 8 ++++----
 app/assets/stylesheets/admin/admin_base.scss              | 5 +++--
 5 files changed, 10 insertions(+), 9 deletions(-)

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 @@
 
     <div class='table blocked-emails'>
       <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 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>
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 @@
-<div class="col email">{{email}}</div>
+<div class="col first email">{{email}}</div>
 <div class="col action">{{actionName}}</div>
 <div class="col match_count">{{match_count}}</div>
 <div class="col last_match_at">{{unboundAgeWithTooltip last_match_at}}</div>
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 @@
 
 <div class='table staff-actions'>
   <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 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 created_at">{{i18n admin.logs.staff_actions.when}}</div>
     <div class="col heading context">{{i18n admin.logs.staff_actions.context}}</div>
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 @@
-<div class="col value action">
-  <a {{action filterByAction action_name}}>{{actionName}}</a>
-</div>
-<div class="col value staff_user">
+<div class="col value first staff_user">
   {{#linkTo 'adminUser' staff_user}}{{avatar staff_user imageSize="tiny"}}{{/linkTo}}
   {{#linkTo 'adminUser' staff_user}}{{staff_user.username}}{{/linkTo}}
 </div>
+<div class="col value action">
+  <a {{action filterByAction action_name}}>{{actionName}}</a>
+</div>
 <div class="col value target_user">
   {{#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%;