X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/f72c34aaf85b736a2d4b880886ca84f490b28ba0..7c89e7c0b418c5c4d9692b5e153946571a6ea994:/app/views/issues/show.html.erb?ds=sidebyside diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb index 4de7a77c6..3e2f5ef48 100644 --- a/app/views/issues/show.html.erb +++ b/app/views/issues/show.html.erb @@ -1,57 +1,62 @@ <% content_for :heading do %> -
Issue against: <%= reportable_url(@issue.reportable) %>
-Issue type: <%= @issue.reportable_type %>
-- - <%= @issue.reports.count %> reports | First reported: <%= l @issue.created_at.to_date, :format => :long %> <%= "| Last resolved at #{l(@issue.resolved_at.to_datetime, :format =>:long)}" if @issue.resolved_at? %> <%= "| Last updated at #{l(@issue.updated_at.to_datetime, :format => :long)} by #{@updated_by_admin.display_name}" if @updated_by_admin %> - -
-<%= link_to t('issues.resolve'), resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %>
-<%= link_to t('issues.ignore'), ignore_issue_url(@issue), :method => :post if @issue.may_ignore? %>
-<%= link_to t('issues.reopen'), reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %>
+<%= @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 %> + +
++ <%= 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 %> -