X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/c3ad6aa2923c03aeeea0b57033b0a9238d262aa2..60dd5ce6e6e4e3222920fa9d6804c25deae3529c:/app/views/issues/_comments.html.erb?ds=sidebyside

diff --git a/app/views/issues/_comments.html.erb b/app/views/issues/_comments.html.erb
index ee40c9d5a..7776d9ee3 100644
--- a/app/views/issues/_comments.html.erb
+++ b/app/views/issues/_comments.html.erb
@@ -1,30 +1,28 @@
-<div class="issue-comments">
+<div>
   <% 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="row">
+      <div class="col-auto">
+        <%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
+      </div>
+      <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 => 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>
-      <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 => :friendly %>
-    </span>
     <hr>
   <% 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, :required => true %>
-  <%= label_tag t('issues.show.comments.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>