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 3af1c402d6d139a71cbbe686c2ceb6f5a32ad459..5efa6a1bb776b754cb86129622fec24faac88fbf 100644 (file)
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -11,37 +11,35 @@
   </small>
 </p>
 <p>
-  <%= link_to t('.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? %>
-  | <%= link_to t('.ignore'), ignore_issue_url(@issue), :method => :post %>
+  | <%= 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>
+<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">
+<div class="row">
+  <div class="col-md-8">
     <h3><%= t ".reports_of_this_issue" %></h3>
 
     <% if @read_reports.present? %>
     <div class="read-reports">
       <h4><%= t ".read_reports" %></h4>
-      <%= render 'reports', :reports => @read_reports %>
+      <%= render "reports", :reports => @read_reports %>
     </div>
     <% end %>
 
     <% if @unread_reports.any? %>
     <div class="unread-reports">
       <h4><%= t ".new_reports" %></h4>
-      <%= render 'reports', :reports => @unread_reports %>
+      <%= render "reports", :reports => @unread_reports %>
     </div>
     <% end %>
-    <br/>
   </div>
 
   <% if @issue.reported_user %>
-    <div class="related-reports">
+    <div class="col-md-4">
       <h3><%= t ".other_issues_against_this_user" %></h3>
       <% if @related_issues.count > 1 %>
         <ul>
@@ -59,4 +57,4 @@
 </div>
 
 <h3><%= t ".comments_on_this_issue" %></h3>
-<%= render 'comments', :comments => @comments %>
+<%= render "comments", :comments => @comments %>