Merge remote-tracking branch 'upstream/pull/3539'

[rails.git] / app / views / issues / index.html.erb

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 98fbbaa2d345525ffc4e266fcc0c6fda4bd75cc5..4f9d3dbd6d7d91919899509df89d82d9d79b7904 100644 (file)
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,41 +1,77 @@
-<p id= "notice"><%= notice %></p>
-

 <% content_for :heading do %>
 <% content_for :heading do %>

-       <h1>List of <%= @user_role %> issues:</h1>
+  <h1><%= t ".title" %></h1>

 <% end %>
 
 <% end %>
 

+<p><%= t ".search_guidance" %></p>
+

 <%= form_tag(issues_path, :method => :get) do %>
 <%= form_tag(issues_path, :method => :get) do %>

-       <%= text_field_tag :search_by_user, params[:search_by_user], placeholder: "Search by Reported User" %>
-       <%= submit_tag "Search" %>
+  <div class="form-row">
+    <div class="form-group col-md-auto">
+      <%= select_tag :status,
+                     options_for_select(Issue.aasm.states.map(&:name).map { |state| [t(".states.#{state}"), state] }, params[:status]),
+                     :include_blank => t(".select_status"),
+                     :data => { :behavior => "category_dropdown" },
+                     :class => "form-control custom-select" %>
+    </div>
+    <div class="form-group col-md-auto">
+      <%= select_tag :issue_type,
+                     options_for_select(@issue_types, params[:issue_type]),
+                     :include_blank => t(".select_type"),
+                     :data => { :behavior => "category_dropdown" },
+                     :class => "form-control custom-select" %>
+    </div>
+    <div class="form-group col-md">
+      <%= text_field_tag :search_by_user,
+                         params[:search_by_user],
+                         :placeholder => t(".reported_user"),
+                         :autocomplete => "on",
+                         :class => "form-control" %>
+    </div>
+    <div class="form-group col-md-auto">
+      <%= select_tag :last_updated_by,
+                     options_for_select(@users.all.collect { |f| [f.display_name, f.id] } << [t(".not_updated"), "nil"], params[:last_updated_by]),
+                     :include_blank => t(".select_last_updated_by"),
+                     :data => { :behavior => "category_dropdown" },
+                     :class => "form-control custom-select" %>
+    </div>
+    <div class="form-group col-md-auto">
+      <%= submit_tag t(".search"), :name => nil, :class => "btn btn-primary" %>
+    </div>
+  </div>

 <% end %>
 <% end %>

-<br/>
-<br/>
-
-<table>
-       <thead>
-               <tr>
-                       <tr>
-                               <td><b> Status </b></td>
-                               <td><b> Number of Reports</b></td>
-                               <td><b> Last updated at</b></td>
-                               <td><b> Link to instance </b></td>
-                               <td><b> Reported User </b></td>
-                               <td></td>
-                       </tr>
-               </tr>
-       </thead>
-       <tbody>
-               <% @issues.each do |issue| %>
-                       <tr>
-                               <td><span class="count-number"> <strong><%= issue.status %></strong></span> </td>
-                               <td><%= issue.reports.count %></td>
-                               <td><%= issue.updated_at.strftime('%H:%M, %m/%d/%y') %></td>
-                               <td> <%= reportable_url(issue.reportable) %></td>
-                               <td><%= link_to issue.user.display_name , :controller => :user, :action => :view,:display_name => issue.user.display_name %></td>
-                               <td><b><%= link_to "Show Reports", issue %></b></td>
-                       </tr>
-               <% end %>
-       </tbody>
-</table>
-

 
 

+<% if @issues.length == 0 %>
+  <p><%= t ".issues_not_found" %></p>
+<% else %>
+  <table class="table table-sm">
+    <thead>
+      <tr>
+        <th><%= t ".status" %></th>
+        <th><%= t ".reports" %></th>
+        <th><%= t ".reported_item" %></th>
+        <th><%= t ".reported_user" %></th>
+        <th><%= t ".last_updated" %></th>
+      </tr>
+    </thead>
+    <tbody>
+      <% @issues.each do |issue| %>
+        <tr>
+          <td><%= t ".states.#{issue.status}" %></td>
+          <td class="text-nowrap"><%= 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, user_path(issue.reported_user) if issue.reported_user %></td>
+          <td>
+            <% if issue.user_updated %>
+              <%= t ".last_updated_time_user_html", :user => link_to(issue.user_updated.display_name, user_path(issue.user_updated)),
+                                                    :time => time_ago_in_words(issue.updated_at, :scope => :"datetime.distance_in_words_ago"),
+                                                    :title => l(issue.updated_at) %>
+            <% else %>
+              <%= t ".last_updated_time_html", :time => time_ago_in_words(issue.updated_at, :scope => :"datetime.distance_in_words_ago"),
+                                               :title => l(issue.updated_at) %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>