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

[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 de4989afd1852e3de9ddda4025e4446a42db66cd..f828e5a4350b4a80bb64306190aa85ecc4cd18bd 100644 (file)
--- a/app/views/issues/_comments.html.erb
+++ b/app/views/issues/_comments.html.erb
@@ -1,21 +1,28 @@
-<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 %>
-       </div>
-       <span class="deemphasize">
-       On <%= l comment.created_at.to_datetime, :format => :long %> </span>
-       <hr>
-<% end %>
+<div>
+  <% comments.each do |comment| %>
+    <div class="row">
+      <div class="col-auto">
+        <%= link_to user_thumbnail(comment.user), comment.user %>
+      </div>
+      <div class="col">
+        <p class="text-body-secondary">
+          <%= t ".comment_from_html", :user_link => link_to(comment.user.display_name, comment.user),
+                                      :comment_created_at => tag.time(l(comment.created_at.to_datetime, :format => :friendly),
+                                                                      :datetime => comment.created_at.xmlschema) %>
+        </p>
+        <div class="richtext text-break"><%= comment.body.to_html %></div>
+      </div>
+    </div>
+    <hr>
+  <% end %>
+</div>
+
+<div>
+  <%= bootstrap_form_for @new_comment, :url => issue_comments_path(@issue) do |f| %>
+    <%= f.richtext_field :body, :cols => 80, :rows => 20, :hide_label => true %>
+    <%= f.form_group do %>
+      <%= f.check_box :reassign, { :label => t(".reassign_param"), :id => "reassign", :name => "reassign", :checked => false }, true, false %>
+    <% end %>
+    <%= f.primary %>
+  <% end %>
 </div>
-<br/>
-<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 %>
-       <%= submit_tag 'Submit' %>
-       <% end %>
-</div>
\ No newline at end of file