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

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

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 71b5b40f6fef543d58d2128833f3627c90dc4b97..a58b8c5cb18b4f36c4bb1c0bf978618dc08b0255 100644 (file)
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,7 +1,7 @@
 <% content_for :heading do %>
 <h1><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h1>
 <p><%= @issue.reportable.model_name.human %> : <%= link_to reportable_title(@issue.reportable), reportable_url(@issue.reportable) %></p>
 <% content_for :heading do %>
 <h1><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h1>
 <p><%= @issue.reportable.model_name.human %> : <%= link_to reportable_title(@issue.reportable), reportable_url(@issue.reportable) %></p>

-<p class="text-muted">
+<p class="text-body-secondary">

   <small>
     <%= @issue.assigned_role %>
     <% if @issue.reports.count > 0 %>
   <small>
     <%= @issue.assigned_role %>
     <% if @issue.reports.count > 0 %>


@@ -9,16 +9,19 @@
     <% else %>
       | <%= t ".no_reports" %>
     <% end %>
     <% else %>
       | <%= t ".no_reports" %>
     <% end %>

-      | <%= t ".report_created_at",
-              :datetime => l(@issue.created_at.to_datetime, :format => :friendly) %>
+      | <%= t ".report_created_at_html",
+              :datetime => tag.time(l(@issue.created_at.to_datetime, :format => :friendly),
+                                    :datetime => @issue.created_at.xmlschema) %>

     <% if @issue.resolved_at? %>
     <% if @issue.resolved_at? %>

-      | <%= t ".last_resolved_at",
-              :datetime => l(@issue.resolved_at.to_datetime, :format => :friendly) %>
+      | <%= t ".last_resolved_at_html",
+              :datetime => tag.time(l(@issue.resolved_at.to_datetime, :format => :friendly),
+                                    :datetime => @issue.resolved_at.xmlschema) %>

     <% end %>
     <% if @issue.user_updated %>
     <% end %>
     <% if @issue.user_updated %>

-      | <%= t ".last_updated_at",
-              :datetime => l(@issue.updated_at.to_datetime, :format => :friendly),
-              :displayname => @issue.user_updated.display_name %>
+      | <%= t ".last_updated_at_html",
+              :datetime => tag.time(l(@issue.updated_at.to_datetime, :format => :friendly),
+                                    :datetime => @issue.updated_at.xmlschema),
+              :displayname => link_to(@issue.user_updated.display_name, @issue.user_updated) %>

     <% end %>
   </small>
 </p>
     <% end %>
   </small>
 </p>


@@ -42,7 +45,7 @@
     <h3><%= t ".reports_of_this_issue" %></h3>
 
     <% if @read_reports.present? %>
     <h3><%= t ".reports_of_this_issue" %></h3>
 
     <% if @read_reports.present? %>

-    <div class="bg-light text-muted">
+    <div class="bg-body-tertiary text-body-secondary">

       <h4><%= t ".read_reports" %></h4>
       <%= render "reports", :reports => @read_reports %>
     </div>
       <h4><%= t ".read_reports" %></h4>
       <%= render "reports", :reports => @read_reports %>
     </div>