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

[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 24a74c728ef0600f31cedd0438d64a419d1cddd0..a58b8c5cb18b4f36c4bb1c0bf978618dc08b0255 100644 (file)
--- a/app/views/issues/show.html.erb
+++ b/app/views/issues/show.html.erb
@@ -1,22 +1,43 @@
 <% content_for :heading do %>
 <% content_for :heading do %>

-<h2><%= t ".title", :status => @issue.status.humanize, :issue_id => @issue.id %></h2>
+<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><%= @issue.reportable.model_name.human %> : <%= link_to reportable_title(@issue.reportable), reportable_url(@issue.reportable) %></p>

-<p class="deemphasize">
+<p class="text-body-secondary">

   <small>
     <%= @issue.assigned_role %>
   <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 %>
+    <% 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>
   </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>
+<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="row">
 <% end %>
 
 <div class="row">


@@ -24,14 +45,14 @@
     <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-body-tertiary text-body-secondary">

       <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>
       <h4><%= t ".new_reports" %></h4>
       <%= render "reports", :reports => @unread_reports %>
     </div>


@@ -39,7 +60,7 @@
   </div>
 
   <% if @issue.reported_user %>
   </div>
 
   <% if @issue.reported_user %>

-    <div class="col-md-4 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>