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

[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 e97479b90ae733f92bd5aefc9385210b4b44d8b9..5efa6a1bb776b754cb86129622fec24faac88fbf 100644 (file)
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,60 +1,60 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-<h2> <%= @issue.status.humanize %> Issue #<%= @issue.id %> <br/></h2>
-<p><%= report_type(@issue.reportable_type) %> : <%= reportable_url(@issue.reportable) %></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="deemphasize">
   <small>
 <p class="deemphasize">
   <small>

-    <%= @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 %>
+    <%= @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>
   </small>
 </p>
 <p>

-  <%= link_to t('issues.resolve'), resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %>
+  <%= link_to t(".resolve"), resolve_issue_url(@issue), :method => :post if @issue.may_resolve? %>

   <% if @issue.may_ignore? %>
   <% if @issue.may_ignore? %>

-  | <%= link_to t('issues.ignore'), ignore_issue_url(@issue), :method => :post %>
+  | <%= link_to t(".ignore"), ignore_issue_url(@issue), :method => :post %>

   <% end %>
 </p>
   <% end %>
 </p>

-<p><%= link_to t('issues.reopen'), reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %></p>
+<p><%= link_to t(".reopen"), reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %></p>

 <% end %>
 
 <% end %>
 

-<div class="report-related-block">
-
-  <div class="report-block">
-    <h3>Reports under this issue:</h3>
+<div class="row">
+  <div class="col-md-8">
+    <h3><%= t ".reports_of_this_issue" %></h3>

 
     <% if @read_reports.present? %>
     <div class="read-reports">
 
     <% if @read_reports.present? %>
     <div class="read-reports">

-      <h4>Read Reports:</h4>
-      <br/>
-      <%= render 'reports',reports: @read_reports %>
+      <h4><%= t ".read_reports" %></h4>
+      <%= render "reports", :reports => @read_reports %>

     </div>
     <% end %>
 
     <% if @unread_reports.any? %>
     <div class="unread-reports">
     </div>
     <% end %>
 
     <% if @unread_reports.any? %>
     <div class="unread-reports">

-      <h4>New Reports:</h4>
-      <br/>
-      <%= render 'reports',reports: @unread_reports %>
+      <h4><%= t ".new_reports" %></h4>
+      <%= render "reports", :reports => @unread_reports %>

     </div>
     <% end %>
     </div>
     <% end %>

-    <br/>

   </div>
 
   </div>
 

-  <div class="related-block">
-    <h3> Other issues against this user: </h3>
-    <div class="unread-reports">
+  <% if @issue.reported_user %>
+    <div class="col-md-4">
+      <h3><%= t ".other_issues_against_this_user" %></h3>

       <% if @related_issues.count > 1 %>
       <% if @related_issues.count > 1 %>

-        <% @related_issues.each do |issue| %>
-          <% if issue.id != @issue.id %>
-            <%= reports_url(issue) %> <br/>
+        <ul>
+          <% @related_issues.each do |issue| %>
+            <% if issue.id != @issue.id %>
+              <li><%= link_to reportable_title(issue.reportable), issue %></li>
+            <% end %>

           <% end %>
           <% end %>

-        <% end %>
+        </ul>

       <% else %>
       <% else %>

-        <p>No other reports against this user!</p>
+        <p><%= t ".no_other_issues" %></p>

       <% end %>
     </div>
       <% end %>
     </div>

-  </div>
+  <% end %>

 </div>
 
 </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 %>