X-Git-Url: https://git.openstreetmap.org/rails.git/blobdiff_plain/683722ed5c1b3224a04c23b4d175a0638964f713..916f2c9036d280d1de451e35847d8b37c6550109:/app/views/issues/show.html.erb

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index abbe0fa98..4611324f3 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,33 +1,62 @@
 <% content_for :heading do %>
-	<h2> Issue #<%= @issue.id %> <br/> <span class="count-number">Status: <strong><%= @issue. status %></strong></span></h2>
-	<p>Issue against: <%= reportable_url(@issue.reportable) %></p>
-	<p>Issue type: <%= @issue.reportable_type %></p>
+	<h2> <%= @issue.status.humanize %> Issue #<%= @issue.id %> <br/></h2>
+	<p><%= report_type(@issue.reportable_type) %> : <%= reportable_url(@issue.reportable) %></p>
 	<p class="deemphasize">
 		<small>
-			<%= @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? %>
+			<%= @issue.reports.count %> reports | First reported: <%= l @issue.created_at.to_datetime, :format => :friendly %>  <%= "| Last resolved at #{l(@issue.resolved_at.to_datetime, :format =>:friendly)}" if @issue.resolved_at? %> <%= "| Last updated at #{l(@issue.updated_at.to_datetime, :format => :friendly)} by #{@updated_by_admin.display_name}" if @updated_by_admin %>
 		</small>
 	</p>
-	<p><%= link_to "Resolve", resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %></p>
-	<p><%= link_to "Ignore", ignore_issue_url(@issue), :method => :post if @issue.may_ignore? %></p>
-	<p><%= link_to "Reopen", reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %></p>
+	<p>
+		<%= link_to t('issues.resolve'), resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %>
+		<% if @issue.may_ignore? %>
+			| <%= link_to t('issues.ignore'), ignore_issue_url(@issue), :method => :post %>
+		<% end %>
+	</p>
+	<p><%= link_to t('issues.reopen'), reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %></p>
 <% end %>
-<h3>Reports under this issue:</h3>
 
-<% if @read_reports.present? %>
-	<div class="read-reports">
-		<h4>Read Reports:</h4>
-		<%= render 'reports',reports: @read_reports %>
+<div class="report-related-block">
+
+	<div class="report-block">
+		<h3>Reports under this issue:</h3>
+
+		<% if @read_reports.present? %>
+			<div class="read-reports">
+				<h4>Read Reports:</h4>
+				<br/>
+				<%= render 'reports',reports: @read_reports %>
+			</div>
+		<% end %>	
+
+		<% if @unread_reports.any? %>
+			<div class="unread-reports">
+				<h4>New Reports:</h4>
+				<br/>
+				<%= render 'reports',reports: @unread_reports %>
+			</div>
+		<% end %>	
+		<br/>
 	</div>
-<% end %>	
 
-<% if @unread_reports.any? %>
-	<div class="unread-reports">
-		<h4>New Reports:</h4>
-		<%= render 'reports',reports: @unread_reports %>
+	<div class="related-block">
+		<h3> Other issues against this user: </h3>
+			<div class="unread-reports">
+				<% if @related_issues.count > 1 %>
+					<% @related_issues.each do |issue| %>
+						<% if issue.id != @issue.id %>
+							<%= reports_url(issue) %> <br/>
+						<% end %>
+					<% end %>
+				<% else %>
+					<p>No other reports against this user!</p>
+				<% end %>
+			</div>
 	</div>
-<% end %>	
-<br/>
+
+</div>
+
 <h3>Comments on this issue:</h3>
 	<div class="unread-reports">
 		<%= render 'comments', comments: @comments %>
 	</div>
+