Don't send comment text when reopening a note

[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 a0402230421ad894ee674fd4758bb4baf18b68ce..f828e5a4350b4a80bb64306190aa85ecc4cd18bd 100644 (file)
--- a/app/views/issues/_comments.html.erb
+++ b/app/views/issues/_comments.html.erb
@@ -1,25 +1,28 @@
-<div class="issue-comments">
+<div>
   <% comments.each do |comment| %>
-    <div class="comment">
-      <div class="float-left">
-        <%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
+    <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>
-      <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>
-<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(".reassign_param") %> <%= check_box_tag :reassign, true %>
-  <br />
-  <br />
-  <%= f.submit %>
+
+<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>