X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/69c1f6d1862aad00f80a0d2e32dbbe70aba65649..4965c19b7a8c96ab87b543af1fc36a1ad7514c09:/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 e64eb0e71..ad463c259 100644
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,57 +1,81 @@
 <% 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>
+<h1><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h1>
+<p><%= @issue.reportable.model_name.human %> : <%= link_to reportable_title(@issue.reportable), reportable_url(@issue.reportable) %></p>
+<p class="text-muted">
+  <small>
+    <%= @issue.assigned_role %>
+    <% 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, @issue.user_updated) %>
+    <% end %>
+  </small>
+</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="report-related-block">
+<div class="row">
+  <div class="col-md-8">
+    <h3><%= t ".reports_of_this_issue" %></h3>
 
-	<div class="report-block">
-		<h3>Reports under this issue:</h3>
+    <% if @read_reports.present? %>
+    <div class="bg-body-tertiary text-muted">
+      <h4><%= t ".read_reports" %></h4>
+      <%= render "reports", :reports => @read_reports %>
+    </div>
+    <% end %>
 
-		<% 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 %>
-							<%= reports_url(issue) %> <br/>
-						<% end %>
-					<% end %>
-				<% else %>
-					<p>No other reports against this user!</p>
-				<% end %>
-			</div>
-	</div>
+    <% if @unread_reports.any? %>
+    <div>
+      <h4><%= t ".new_reports" %></h4>
+      <%= render "reports", :reports => @unread_reports %>
+    </div>
+    <% end %>
+  </div>
 
+  <% if @issue.reported_user %>
+    <div class="col-md-4">
+      <h3><%= t ".other_issues_against_this_user" %></h3>
+      <% if @related_issues.count > 1 %>
+        <ul>
+          <% @related_issues.each do |issue| %>
+            <% if issue.id != @issue.id %>
+              <li><%= link_to reportable_title(issue.reportable), issue %></li>
+            <% end %>
+          <% end %>
+        </ul>
+      <% else %>
+        <p><%= t ".no_other_issues" %></p>
+      <% end %>
+    </div>
+  <% end %>
 </div>
 
-<h3>Comments on this issue:</h3>
-	<div class="unread-reports">
-		<%= render 'comments', comments: @comments %>
-	</div>
-
+<h3><%= t ".comments_on_this_issue" %></h3>
+<%= render "comments", :comments => @comments %>