X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/65c3c2a91558a88ceea3c772d2b290281c642c9c..68d6b7279e547afab98057a2ea4c64ef3c53e37f:/app/views/issues/show.html.erb diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 5efa6a1bb..eba4448aa 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -1,22 +1,28 @@ <% content_for :heading do %> -

<%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %>

+

<%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %>

<%= @issue.reportable.model_name.human %> : <%= link_to reportable_title(@issue.reportable), reportable_url(@issue.reportable) %>

-

+

<%= @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 %> + <%= " | #{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 %>

-

- <%= 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 %> -

-

<%= link_to t(".reopen"), reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %>

+ <% end %>
@@ -24,14 +30,14 @@

<%= t ".reports_of_this_issue" %>

<% if @read_reports.present? %> -
+

<%= t ".read_reports" %>

<%= render "reports", :reports => @read_reports %>
<% end %> <% if @unread_reports.any? %> -
+

<%= t ".new_reports" %>

<%= render "reports", :reports => @unread_reports %>