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

[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 5cb99f2f16eb9ad2ecfd4bea804286673208d9cd..9c5695e0a88558c794a21ce94bb01aefb05e392a 100644 (file)
--- a/app/views/issues/_comments.html.erb
+++ b/app/views/issues/_comments.html.erb
@@ -1,25 +1,27 @@
-<div class="issue-comments">
+<div>

   <% comments.each do |comment| %>
   <% comments.each do |comment| %>

-    <div class="comment">
-      <div style="float:left">
+    <div class="row">
+      <div class="col-auto">

         <%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
       </div>
         <%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
       </div>

-      <b> <%= link_to comment.user.display_name, user_path(comment.user) %> </b> <br/>
-      <%= comment.body %>
+      <div class="col">
+        <p class="text-muted">
+          <%= 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>
+        <div class="richtext text-break"><%= comment.body.to_html %></div>
+      </div>

     </div>
     </div>

-    <span class="deemphasize">
-      <%= t(".created_at", :datetime => l(comment.created_at.to_datetime, :format => :friendly)) %>
-    </span>

     <hr>
   <% end %>
 </div>
     <hr>
   <% end %>
 </div>

-<br/>
-<div class="comment">
-  <%= 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/>
-  <%= submit_tag '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>
   <% end %>
 </div>