Rework the users#show page to avoid custom column css

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

-<%= 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 :issue_type, options_for_select(@issue_types, params[:issue_type]), :include_blank => t(".select_type"), :data => { :behavior => 'category_dropdown' } %>
-<%= text_field_tag :search_by_user, params[:search_by_user], placeholder: t(".reported_user") %>
-<%= 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 :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 :issue_type, options_for_select(@issue_types, params[:issue_type]), :include_blank => t(".select_type"), :data => { :behavior => "category_dropdown" } %>
+<%= text_field_tag :search_by_user, params[:search_by_user], :placeholder => t(".reported_user") %>
+<%= 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" } %>

 <%= submit_tag t(".search"), :name => nil %>
 <% end %>
 <%= submit_tag t(".search"), :name => nil %>
 <% end %>

-<br/>
+<br />

 
 <% if @issues.length == 0 %>
   <p><%= t ".issues_not_found" %></p>
 <% end %>
 
 
 <% if @issues.length == 0 %>
   <p><%= t ".issues_not_found" %></p>
 <% end %>
 

-<br/>
+<br />

 
 

-<table class="issues-list">
+<table class="table table-sm">

   <thead>
     <tr>
       <th><%= t ".status" %></th>
   <thead>
     <tr>
       <th><%= t ".status" %></th>


@@ -32,16 +32,16 @@
     <% @issues.each do |issue| %>
       <tr>
         <td><%= t ".states.#{issue.status}" %></td>
     <% @issues.each do |issue| %>
       <tr>
         <td><%= t ".states.#{issue.status}" %></td>

-        <td><%= link_to t(".reports_count", :count => issue.reports_count), issue %></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)),
         <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 => distance_of_time_in_words_to_now(issue.updated_at),
+                                                  :time => time_ago_in_words(issue.updated_at, :scope => :'datetime.distance_in_words_ago'),

                                                   :title => l(issue.updated_at) %>
           <% else %>
                                                   :title => l(issue.updated_at) %>
           <% else %>

-            <%= t ".last_updated_time_html", :time => distance_of_time_in_words_to_now(issue.updated_at),
+            <%= 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>
                                              :title => l(issue.updated_at) %>
           <% end %>
         </td>