From 05ae0755a4b0810fdd012e2fb7a636b260ef69ce Mon Sep 17 00:00:00 2001
From: Andy Allan <git@gravitystorm.co.uk>
Date: Wed, 28 Feb 2018 14:56:47 +0800
Subject: [PATCH] Rearrange issues table and combine some columns.

---
 app/views/issues/index.html.erb | 18 ++++++++----------
 config/locales/en.yml           | 10 ++++++----
 2 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 0edf364ec..2980f5e01 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -22,24 +22,22 @@
   <thead>
     <tr>
       <td><b><%= t ".status" %></b></td>
-      <td><b><%= t ".number_of_reports" %></b></td>
-      <td><b><%= t ".last_updated_at" %></b></td>
-      <td><b><%= t ".last_updated_by" %></b></td>
-      <td><b><%= t ".link_to_reports" %></b></td>
+      <td><b><%= t ".reports" %></b></td>
+      <td><b><%= t ".reported_item" %></b></td>
       <td><b><%= t ".reported_user" %></b></td>
-      <td><b><%= t ".link_to_reported_instance" %></b></td>
+      <td><b><%= t ".last_updated_by" %></b></td>
+      <td><b><%= t ".last_updated_at" %></b></td>
     </tr>
   </thead>
   <tbody>
     <% @issues.each do |issue| %>
       <tr>
         <td><%= t "issues.states.#{issue.status}" %></td>
-        <td style="text-align:center;"><%= issue.reports_count %></td>
-        <td><%= l(issue.updated_at.to_datetime, :format => :friendly) %></td>
-        <td><% if issue.user_updated %> <%= issue.user_updated.display_name %> <% else %> - <% end %></td>
-        <td><%= link_to reportable_title(issue.reportable), issue %></td>
+        <td><%= link_to t(".reports_count", :count => issue.reports_count), issue %></td>
+        <td><%= link_to reportable_title(issue.reportable), reportable_url(issue.reportable) %></td>
         <td><%= link_to issue.reported_user.display_name, :controller => :user, :action => :view, :display_name => issue.reported_user.display_name if issue.reported_user %></td>
-        <td><%= link_to t(".show_instance"), reportable_url(issue.reportable) %></td>
+        <td><% if issue.user_updated %> <%= issue.user_updated.display_name %> <% else %> - <% end %></td>
+        <td><%= l(issue.updated_at.to_datetime, :format => :friendly) %></td>
       </tr>
     <% end %>
   </tbody>
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 3ff6b8c12..bb1292d9c 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -924,13 +924,15 @@ en:
       user_not_found: User does not exist
       issues_not_found: No such issues found
       status: Status
-      show_instance: Show Instance
-      number_of_reports: Number of Reports
+      reports: Reports
       last_updated_at: Last Updated At
       last_updated_by: Last Updated By
-      link_to_reports: Link to Reports
+      link_to_reports: View Reports
       reported_user: Reported User
-      link_to_reported_instance: Link to Reported Instance
+      reports_count:
+        one: "1 Report"
+        other: "%{count} Reports"
+      reported_item: Reported Item
     create:
       successful_report: Your report has been registered sucessfully
       provide_details: Please provide the required details
-- 
2.39.5