From a9c251e71a7017c2ab39a8b36b00f7e304b4300f Mon Sep 17 00:00:00 2001
From: Jeff Atwood <jatwood@discourse.org>
Date: Fri, 21 Jun 2013 00:29:54 -0700
Subject: [PATCH] restructure /admin/flags rows a bit

---
 .../admin/templates/flags.js.handlebars       | 29 ++++++++++---------
 app/assets/stylesheets/admin/admin_base.scss  |  5 ++--
 config/locales/client.en.yml                  | 14 ++++-----
 3 files changed, 25 insertions(+), 23 deletions(-)

diff --git a/app/assets/javascripts/admin/templates/flags.js.handlebars b/app/assets/javascripts/admin/templates/flags.js.handlebars
index e12998d6cc9..f360e5b9276 100644
--- a/app/assets/javascripts/admin/templates/flags.js.handlebars
+++ b/app/assets/javascripts/admin/templates/flags.js.handlebars
@@ -36,19 +36,6 @@
 
           <td class='last-flagged'>{{date flag.lastFlagged}}</td>
 
-          <td 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>
-                <button title='{{i18n admin.flags.defer_title}}' class='btn' {{action deferFlags flag}}><i class="icon-external-link"></i> {{i18n admin.flags.defer}}</button>
-              {{else}}
-                <button title='{{i18n admin.flags.agree_hide_title}}' class='btn' {{action agreeFlags flag}}><i class="icon-thumbs-up"></i> {{i18n admin.flags.agree_hide}}</button>
-                <button title='{{i18n admin.flags.disagree_title}}' class='btn' {{action disagreeFlags flag}}><i class="icon-thumbs-down"></i> {{i18n admin.flags.disagree}}</button>
-              {{/if}}
-              <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}}
@@ -59,10 +46,24 @@
               </td>
               <td></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>
+                <button title='{{i18n admin.flags.defer_title}}' class='btn' {{action deferFlags flag}}><i class="icon-external-link"></i> {{i18n admin.flags.defer}}</button>
+              {{else}}
+                <button title='{{i18n admin.flags.agree_hide_title}}' class='btn' {{action agreeFlags flag}}><i class="icon-thumbs-up"></i> {{i18n admin.flags.agree_hide}}</button>
+                <button title='{{i18n admin.flags.disagree_title}}' class='btn' {{action disagreeFlags flag}}><i class="icon-thumbs-down"></i> {{i18n admin.flags.disagree}}</button>
+              {{/if}}
+              <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>
       </tbody>
     </table>
   {{else}}
diff --git a/app/assets/stylesheets/admin/admin_base.scss b/app/assets/stylesheets/admin/admin_base.scss
index e1b599745e9..5378c2daad5 100644
--- a/app/assets/stylesheets/admin/admin_base.scss
+++ b/app/assets/stylesheets/admin/admin_base.scss
@@ -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;
   }
 }
diff --git a/config/locales/client.en.yml b/config/locales/client.en.yml
index 166b4b25db0..a43c61e5abb 100644
--- a/config/locales/client.en.yml
+++ b/config/locales/client.en.yml
@@ -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"