X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/453f758f91d57688663e354a54061a65945410e7..732e1ab03a3b0f003dd8dc10e505d8d952fa18b9:/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 1c3b8bb65..4de7a77c6 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,2 +1,57 @@
-<h1>Issues#show</h1>
-<p>Find me in app/views/issues/show.html.erb</p>
+<% 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>
+	<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_at? %> <%= "| Last updated at #{l(@issue.updated_at.to_datetime, :format => :long)} by #{@updated_by_admin.display_name}" if @updated_by_admin %>
+		</small>
+	</p>
+	<p><%= link_to t('issues.resolve'), resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %></p>
+	<p><%= link_to t('issues.ignore'), ignore_issue_url(@issue), :method => :post if @issue.may_ignore? %></p>
+	<p><%= link_to t('issues.reopen'), reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %></p>
+<% end %>
+
+<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>
+				<%= render 'reports',reports: @read_reports %>
+			</div>
+		<% end %>	
+
+		<% if @unread_reports.any? %>
+			<div class="unread-reports">
+				<h4>New Reports:</h4>
+				<%= render 'reports',reports: @unread_reports %>
+			</div>
+		<% end %>	
+		<br/>
+	</div>
+
+	<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 %>
+							<%= link_to "#{issue.reportable_type} ##{issue.reportable_id}", issue %> <br/>
+						<% end %>
+					<% end %>
+				<% else %>
+					<p>No other reports against this user!</p>
+				<% end %>
+			</div>
+	</div>
+
+</div>
+
+<h3>Comments on this issue:</h3>
+	<div class="unread-reports">
+		<%= render 'comments', comments: @comments %>
+	</div>
+