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

[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 52f740b0967191576a4aec34e5960d09f0d6f29e..54932cc56b4f8f1e3b3905d4cd7760d7993ae470 100644 (file)
--- a/app/views/issues/_comments.html.erb
+++ b/app/views/issues/_comments.html.erb
@@ -1,29 +1,25 @@
 <div class="issue-comments">
 <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>
-               <b> <%= link_to comment.user.display_name, :controller => :user,:action =>:view, :display_name => comment.user.display_name %> </b> <br/>
-               <%= comment.body %>
-
-               <% if comment.reassign %>
-                       <br/>
-                       <i><%= t('issues.show.comments.reassign') %></i>
-               <% end %>
-       </div>
-       <span class="deemphasize">
-       On <%= l comment.created_at.to_datetime, :format => :long %> </span>
-       <hr>
-<% end %>
+  <% comments.each do |comment| %>
+    <div class="comment">
+      <div class="float-left">
+        <%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
+      </div>
+      <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>
+    <hr>
+  <% end %>

 </div>
 </div>

-<br/>
+<br />

 <div class="comment">
 <div class="comment">

-       <%= form_for :issue_comment, :url => { :action => 'comment', :id => @issue.id, :user_id => @user.id } do |f| %>
-           <%= richtext_area :issue_comment, :body, :cols => 10, :rows => 8, :required => true %>
-           <%= label_tag t('issues.show.comments.reassign_param') %> <%= check_box_tag :reassign, true %> 
-           <br/>
-           <br/>
-       <%= submit_tag 'Submit' %>
-       <% end %>
-</div>
\ No newline at end of file
+  <%= 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(".reassign_param") %> <%= check_box_tag :reassign, true %>
+  <br />
+  <br />
+  <%= f.submit %>
+  <% end %>
+</div>