Merge branch 'master' into moderation

[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 de4989afd1852e3de9ddda4025e4446a42db66cd..d49ae867099097a1ea1de761cb8eadb952458444 100644 (file)
--- a/app/views/issues/_comments.html.erb
+++ b/app/views/issues/_comments.html.erb
@@ -1,21 +1,25 @@
 <div class="issue-comments">
-<% 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>
-               <b> <%= link_to comment.user.display_name, :controller => :user,:action =>:view, :display_name => comment.user.display_name %> </b> <br/>
-               <%= comment.body %>
-       </div>
-       <span class="deemphasize">
-       On <%= l comment.created_at.to_datetime, :format => :long %> </span>
-       <hr>
-<% end %>
+  <% 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>
+      <b> <%= link_to comment.user.display_name, :controller => :user, :action =>:view, :display_name => comment.user.display_name %> </b> <br/>
+      <%= comment.body %>
+    </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 %>
-       <%= submit_tag 'Submit' %>
-       <% end %>
-</div>
\ No newline at end of file
+  <%= 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('issues.show.comments.reassign_param') %> <%= check_box_tag :reassign, true %>
+  <br/>
+  <br/>
+  <%= submit_tag 'Submit' %>
+  <% end %>
+</div>