Merge remote-tracking branch 'upstream/pull/2881'

[rails.git] / app / views / issues / show.html.erb

diff --git a/app/views/issues/show.html.erb b/app/views/issues/show.html.erb
index 84c52d077e89f2d9f07df87279e8177d397e629a..65bd9ced3be35f7fad61b08a2e0e8f163449f911 100644 (file)
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,57 +1,60 @@
 <% 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? %>
-               </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>
+<h2><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h2>
+<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 %>
+    | <%= 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 %>
+  </small>
+</p>
+<p>
+  <%= 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 %>
+</p>
+<p><%= link_to t(".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 %>
-                                               <% end %>
-                                       <% end %>
-                               <% else %>
-                                       <p>No other reports against this user!</p>
-                               <% end %>
-                       </div>
-       </div>
-
+<div class="row">
+  <div class="col-md-8">
+    <h3><%= t ".reports_of_this_issue" %></h3>
+
+    <% if @read_reports.present? %>
+    <div class="bg-light text-muted">
+      <h4><%= t ".read_reports" %></h4>
+      <%= render "reports", :reports => @read_reports %>
+    </div>
+    <% end %>
+
+    <% 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 %>