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

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

diff --git a/app/views/issues/_comments.html.erb b/app/views/issues/_comments.html.erb
index d49ae867099097a1ea1de761cb8eadb952458444..a0402230421ad894ee674fd4758bb4baf18b68ce 100644 (file)
--- a/app/views/issues/_comments.html.erb
+++ b/app/views/issues/_comments.html.erb
@@ -1,25 +1,25 @@
 <div class="issue-comments">
   <% comments.each do |comment| %>
     <div class="comment">
-      <div style="float:left">
-        <%= link_to user_thumbnail(comment.user), :controller => :user, :action =>:view, :display_name => comment.user.display_name %>
+      <div class="float-left">
+        <%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
       </div>
-      <b> <%= link_to comment.user.display_name, :controller => :user, :action =>:view, :display_name => comment.user.display_name %> </b> <br/>
-      <%= comment.body %>
+      <p class="text-muted mb-0">
+        <%= t ".comment_from_html", :user_link => link_to(comment.user.display_name, user_path(comment.user)),
+                                    :comment_created_at => l(comment.created_at.to_datetime, :format => :friendly) %>
+      </p>
+      <p><%= comment.body %></p>
     </div>
-    <span class="deemphasize">
-      On <%= l comment.created_at.to_datetime, :format => :friendly %>
-    </span>
     <hr>
   <% end %>
 </div>
-<br/>
-<div class="comment">
-  <%= form_for @new_comment, url: issue_comments_path(@issue) do |f| %>
+<br />
+<div class="comment standard-form">
+  <%= form_for @new_comment, :url => issue_comments_path(@issue) do |f| %>
   <%= richtext_area :issue_comment, :body, :cols => 10, :rows => 8, :required => true %>
-  <%= label_tag :reassign, t('issues.show.comments.reassign_param') %> <%= check_box_tag :reassign, true %>
-  <br/>
-  <br/>
-  <%= submit_tag 'Submit' %>
+  <%= label_tag :reassign, t(".reassign_param") %> <%= check_box_tag :reassign, true %>
+  <br />
+  <br />
+  <%= f.submit %>
   <% end %>
 </div>