X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/3bd06529c7f9920c4f71498277f453bf1b8dd030..ee4c34172f0a0145344525962cc5411a7f260ff5:/app/views/issues/index.html.erb?ds=sidebyside

diff --git a/app/views/issues/index.html.erb b/app/views/issues/index.html.erb
index 4b7a2de50..12ddf2b32 100644
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -2,45 +2,74 @@
   <h1><%= t ".title" %></h1>
 <% end %>
 
-<%= form_tag(issues_path, :method => :get) do %>
 <p><%= t ".search_guidance" %></p>
-<%= select :status, nil, Issue.aasm.states.map(&:name).map{|state| [t("issues.states.#{state}"), state]}, { :include_blank => t(".select_status")}, data: { behavior: 'category_dropdown' } %>
-<%= select :issue_type, nil, @issue_types, { :include_blank => t(".select_type")}, data: { behavior: 'category_dropdown' } %>
-<%= text_field_tag :search_by_user, params[:search_by_user], placeholder: t(".reported_user") %>
-<%= select :last_updated_by, nil, @users.all.collect  {|f| [f.display_name, f.id]} << [ t(".not_updated"), "nil"], { :include_blank => t(".select_last_updated_by")}, data: { behavior: 'category_dropdown' } %>
-<%= submit_tag t(".search") %>
+
+<%= form_tag(issues_path, :method => :get) do %>
+  <div class="row gx-1">
+    <div class="mb-3 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-select" %>
+    </div>
+    <div class="mb-3 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-select" %>
+    </div>
+    <div class="mb-3 col-md">
+      <%= text_field_tag :search_by_user,
+                         params[:search_by_user],
+                         :placeholder => t(".reported_user"),
+                         :autocomplete => "on",
+                         :class => "form-control" %>
+    </div>
+    <div class="mb-3 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-select" %>
+    </div>
+    <div class="mb-3 col-md-auto">
+      <%= submit_tag t(".search"), :name => nil, :class => "btn btn-primary" %>
+    </div>
+  </div>
 <% end %>
-<br/>
 
 <% if @issues.length == 0 %>
   <p><%= t ".issues_not_found" %></p>
-<% end %>
-
-<br/>
-
-<table>
-  <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 ".reported_user" %></b></td>
-      <td><b><%= t ".link_to_reported_instance" %></b></td>
-    </tr>
-  </thead>
-  <tbody>
-    <% @issues.each do |issue| %>
+<% else %>
+  <table class="table table-sm">
+    <thead>
       <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 issue.reported_user.display_name , :controller => :user, :action => :view, :display_name => issue.reported_user.display_name %></td>
-        <td><%= link_to t(".show_instance"), reportable_url(issue.reportable) %></td>
+        <th><%= t ".status" %></th>
+        <th><%= t ".reports" %></th>
+        <th><%= t ".reported_item" %></th>
+        <th><%= t ".reported_user" %></th>
+        <th><%= t ".last_updated" %></th>
       </tr>
-    <% end %>
-  </tbody>
-</table>
+    </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_ago_user_html", :user => link_to(issue.user_updated.display_name, user_path(issue.user_updated)),
+                                                        :time_ago => friendly_date_ago(issue.updated_at) %>
+            <% else %>
+              <%= friendly_date_ago(issue.updated_at) %>
+            <% end %>
+          </td>
+        </tr>
+      <% end %>
+    </tbody>
+  </table>
+<% end %>