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

[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 af9409662e19af58e749b82686232b72152a5e40..7ff0948db5e961fa53379ebea39e50c166aeb901 100644 (file)
--- a/app/views/issues/_comments.html.erb
+++ b/app/views/issues/_comments.html.erb
@@ -2,29 +2,24 @@
   <% comments.each do |comment| %>
     <div class="comment">
       <div style="float:left">
   <% 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 %>
+        <%= link_to user_thumbnail(comment.user), user_path(comment.user) %>

       </div>
       </div>

-      <b> <%= link_to comment.user.display_name, :controller => :user,:action =>:view, :display_name => comment.user.display_name %> </b> <br/>
+      <b> <%= link_to comment.user.display_name, user_path(comment.user) %> </b> <br />

       <%= comment.body %>
       <%= comment.body %>

-
-      <% if comment.reassign %>
-      <br/>
-      <i><%= t('issues.show.comments.reassign') %></i>
-      <% end %>

     </div>
     <span class="deemphasize">
     </div>
     <span class="deemphasize">

-      On <%= l comment.created_at.to_datetime, :format => :friendly %>
+      <%= t(".created_at", :datetime => l(comment.created_at.to_datetime, :format => :friendly)) %>

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

-<br/>
+<br />

 <div class="comment">
 <div class="comment">

-  <%= 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 %>
   <%= 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' %>
+  <%= label_tag :reassign, t(".reassign_param") %> <%= check_box_tag :reassign, true %>
+  <br />
+  <br />
+  <%= f.submit %>

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