X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/46875fdde3ecdc37bb69e892b15509132a3bf9cf..ca719af262380a906103e7aec9befb4c903693a1:/app/views/issues/show.html.erb?ds=inline

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index ba2738b74..74e7c0a4c 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,22 +1,43 @@
 <% content_for :heading do %>
-<h1><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h1>
+<h1><%= @title %></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 %>
-    | <%= t ".reports", :count => @issue.reports.count %>
-    | <%= t ".report_created_at", :datetime => l(@issue.created_at.to_datetime, :format => :friendly) %>
-    <%= " | #{t('.last_resolved_at', :datetime => l(@issue.resolved_at.to_datetime, :format => :friendly))}" if @issue.resolved_at? %>
-    <%= " | #{t('.last_updated_at', :datetime => l(@issue.updated_at.to_datetime, :format => :friendly), :displayname => @issue.user_updated.display_name)}" if @issue.user_updated %>
+    <% if @issue.reports.count > 0 %>
+      | <%= t ".reports", :count => @issue.reports.count %>
+    <% else %>
+      | <%= t ".no_reports" %>
+    <% end %>
+      | <%= 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? %>
+      | <%= 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 %>
+      | <%= 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>
-<p>
-  <%= link_to t(".resolve"), resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %>
-  <% if @issue.may_ignore? %>
-  | <%= link_to t(".ignore"), ignore_issue_url(@issue), :method => :post %>
-  <% end %>
-</p>
-<p><%= link_to t(".reopen"), reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %></p>
+<nav class="secondary-actions">
+  <ul class="clearfix">
+    <% if @issue.may_resolve? %>
+      <li><%= link_to t(".resolve"), resolve_issue_url(@issue), :method => :post %></li>
+    <% end %>
+    <% if @issue.may_ignore? %>
+      <li><%= link_to t(".ignore"), ignore_issue_url(@issue), :method => :post %></li>
+    <% end %>
+    <% if @issue.may_reopen? %>
+      <li><%= link_to t(".reopen"), reopen_issue_url(@issue), :method => :post %></li>
+    <% end %>
+  </ul>
+</nav>
 <% end %>
 
 <div class="row">
@@ -24,7 +45,7 @@
     <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>