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

[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 3e2f5ef488e34202519d9fe760e6191c14f12216..65bd9ced3be35f7fad61b08a2e0e8f163449f911 100644 (file)
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,7 +1,7 @@
 <% content_for :heading do %>
 <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>
 <% content_for :heading do %>
 <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">
+<p class="text-muted">

   <small>
     <%= @issue.assigned_role %>
     | <%= t ".reports", :count => @issue.reports.count %>
   <small>
     <%= @issue.assigned_role %>
     | <%= t ".reports", :count => @issue.reports.count %>


@@ -19,29 +19,27 @@
 <p><%= link_to t(".reopen"), reopen_issue_url(@issue), :method => :post if @issue.may_reopen? %></p>
 <% end %>
 
 <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? %>
     <h3><%= t ".reports_of_this_issue" %></h3>
 
     <% if @read_reports.present? %>

-    <div class="read-reports">
+    <div class="bg-light text-muted">

       <h4><%= t ".read_reports" %></h4>
       <%= render "reports", :reports => @read_reports %>
     </div>
     <% end %>
 
     <% if @unread_reports.any? %>
       <h4><%= t ".read_reports" %></h4>
       <%= render "reports", :reports => @read_reports %>
     </div>
     <% end %>
 
     <% if @unread_reports.any? %>

-    <div class="unread-reports">
+    <div>

       <h4><%= t ".new_reports" %></h4>
       <%= render "reports", :reports => @unread_reports %>
     </div>
     <% end %>
       <h4><%= t ".new_reports" %></h4>
       <%= render "reports", :reports => @unread_reports %>
     </div>
     <% end %>

-    <br />

   </div>
 
   <% if @issue.reported_user %>
   </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>
       <h3><%= t ".other_issues_against_this_user" %></h3>
       <% if @related_issues.count > 1 %>
         <ul>