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

[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 4f9d3dbd6d7d91919899509df89d82d9d79b7904..12ddf2b32a162f6e77c909eb4458dbd9a771571f 100644 (file)
--- a/app/views/issues/index.html.erb
+++ b/app/views/issues/index.html.erb
@@ -5,36 +5,36 @@
 <p><%= t ".search_guidance" %></p>
 
 <%= form_tag(issues_path, :method => :get) do %>
 <p><%= t ".search_guidance" %></p>
 
 <%= form_tag(issues_path, :method => :get) do %>

-  <div class="form-row">
-    <div class="form-group col-md-auto">
+  <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" },
       <%= 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" %>
+                     :class => "form-select" %>

     </div>
     </div>

-    <div class="form-group col-md-auto">
+    <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" },
       <%= 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" %>
+                     :class => "form-select" %>

     </div>
     </div>

-    <div class="form-group col-md">
+    <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>
       <%= 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">
+    <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" },
       <%= 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" %>
+                     :class => "form-select" %>

     </div>
     </div>

-    <div class="form-group col-md-auto">
+    <div class="mb-3 col-md-auto">

       <%= submit_tag t(".search"), :name => nil, :class => "btn btn-primary" %>
     </div>
   </div>
       <%= submit_tag t(".search"), :name => nil, :class => "btn btn-primary" %>
     </div>
   </div>


@@ -62,12 +62,10 @@
           <td><%= link_to issue.reported_user.display_name, user_path(issue.reported_user) if issue.reported_user %></td>
           <td>
             <% if issue.user_updated %>
           <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) %>
+              <%= 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 %>
             <% 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) %>
+              <%= friendly_date_ago(issue.updated_at) %>

             <% end %>
           </td>
         </tr>
             <% end %>
           </td>
         </tr>