X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/206e1309a95b498a220d8de6cf4ed5970ebd6778..0df788d74232330eea5c2d4854ba0d10796053eb:/app/views/issues/index.html.erb

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 98fbbaa2d..521b53ec0 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -1,41 +1,46 @@
-<p id= "notice"><%= notice %></p>
-
 <% content_for :heading do %>
-	<h1>List of <%= @user_role %> issues:</h1>
+  <h1>List of <%= @user_role %> issues:</h1>
 <% end %>
 
 <%= 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" %>
+Search for a particular issue(s):  <br/>
+<%= select :status, nil, [['open', 0],['resolved',2],['ignored',1]],{:include_blank => "Select status"},data: { behavior: 'category_dropdown' } %>
+<%= select :issue_type, nil, @issue_types,{:include_blank => "Select type"}, data: { behavior: 'category_dropdown' } %>
+<%= text_field_tag :search_by_user, params[:search_by_user], placeholder: "Reported User" %>
+<%= select :last_reported_by, nil, @users.all.collect  {|f| [f.display_name, f.id]} << ['Not updated',"nil"], {:include_blank => "Select last updated by"}, data: { behavior: 'category_dropdown' } %>
+<%= submit_tag "Search" %>
 <% end %>
 <br/>
+
+<% if @issues.length == 0 %>
+  <p><%= t ".search.issues_not_found" %></p>
+<% end %>
+
 <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>
+  <thead>
+    <tr>
+      <td><b>Status</b></td>
+      <td><b>Number of Reports</b></td>
+      <td><b>Last updated at</b></td>
+      <td><b>Last updated by</b></td>
+      <td><b>Link to reports</b></td>
+      <td><b>Reported User</b></td>
+      <td><b>Link to reported instance</b></td>
+    </tr>
+  </thead>
+  <tbody>
+    <% @issues.each do |issue| %>
+      <tr>
+        <td><%= issue.status.humanize %></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><%= reports_url(issue) %></td>
+        <td><%= link_to issue.reported_user.display_name , :controller => :user, :action => :view, :display_name => issue.reported_user.display_name %></td>
+        <td><%= instance_url(issue.reportable) %></td>
+      </tr>
+    <% end %>
+  </tbody>
 </table>
-
-