X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/e342314d8b513dd1b7693a40885fd61d439a3557..71cb2c50fcaf29e2b933fc981e40a00223d94d34:/app/views/issues/show.html.erb

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index ba2738b74..e2099f8e6 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -4,19 +4,40 @@
 <p class="text-muted">
   <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, user_path(@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">