X-Git-Url: https://git.openstreetmap.org./rails.git/blobdiff_plain/d56b1400bc13432afe38a679a8b9028fff1e0453..2d73dc22a2c167b9ac1140e68129af97560b6646:/app/views/issues/_comments.html.erb diff --git a/app/views/issues/_comments.html.erb b/app/views/issues/_comments.html.erb index af9409662..54932cc56 100644 --- a/app/views/issues/_comments.html.erb +++ b/app/views/issues/_comments.html.erb @@ -1,30 +1,25 @@
<% comments.each do |comment| %>
-
- <%= link_to user_thumbnail(comment.user), :controller => :user,:action =>:view, :display_name => comment.user.display_name %> +
+ <%= link_to user_thumbnail(comment.user), user_path(comment.user) %>
- <%= link_to comment.user.display_name, :controller => :user,:action =>:view, :display_name => comment.user.display_name %>
- <%= comment.body %> - - <% if comment.reassign %> -
- <%= t('issues.show.comments.reassign') %> - <% end %> +

+ <%= 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) %> +

+

<%= comment.body %>

- - On <%= l comment.created_at.to_datetime, :format => :friendly %> -
<% end %>
-
+
- <%= form_for :issue_comment, :url => { :action => 'comment', :id => @issue.id, :user_id => @user.id } do |f| %> + <%= form_for @new_comment, :url => issue_comments_path(@issue) 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 %> -
-
- <%= submit_tag 'Submit' %> + <%= label_tag :reassign, t(".reassign_param") %> <%= check_box_tag :reassign, true %> +
+
+ <%= f.submit %> <% end %>