From 64881d8840b4f6cb91ca680e5cda9bece9d1f616 Mon Sep 17 00:00:00 2001
From: evazion <noizave@gmail.com>
Date: Wed, 30 Oct 2019 23:10:39 -0500
Subject: [PATCH] bans: merge banner name + timestamp into one column.

---
 app/views/bans/index.html.erb | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/app/views/bans/index.html.erb b/app/views/bans/index.html.erb
index ed973577f..9542f6d91 100644
--- a/app/views/bans/index.html.erb
+++ b/app/views/bans/index.html.erb
@@ -7,11 +7,10 @@
     <table class="striped autofit">
       <thead>
         <tr>
-          <th>User</th>
-          <th>Banner</th>
-          <th>Banned</th>
+          <th>Banned User</th>
           <th>Duration</th>
           <th>Reason</th>
+          <th>Banner</th>
           <th></th>
         </tr>
       </thead>
@@ -22,17 +21,17 @@
               <%= link_to_user(ban.user) %>
               <%= link_to "»", bans_path(search: search_params.merge(user_name: ban.user.name)) %>
             </td>
-            <td>
-              <%= link_to_user(ban.banner) %>
-              <%= link_to "»", bans_path(search: search_params.merge(banner_name: ban.banner.name)) %>
-            </td>
-            <td><%= time_ago_in_words_tagged(ban.created_at) %></td>
             <td><%= humanized_duration(ban.created_at, ban.expires_at) %></td>
             <td class="col-expand">
               <div class="prose">
                 <%= format_text ban.reason %>
               </div>
             </td>
+            <td>
+              <%= link_to_user ban.banner %>
+              <%= link_to "»", bans_path(search: { banner_name: ban.banner.name }) %>
+              <div><%= time_ago_in_words_tagged(ban.created_at) %></div>
+            </td>
             <td>
               <% if CurrentUser.is_moderator? %>
                 <%= link_to "Edit", edit_ban_path(ban) %>