diff --git a/app/views/news/show.html.erb b/app/views/news/show.html.erb index a10c3cd..d2c8ef1 100644 --- a/app/views/news/show.html.erb +++ b/app/views/news/show.html.erb @@ -33,39 +33,41 @@ <%= link_to_attachments @news %> -
<%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments", :scroll => "comment_comments" %>
+ <% end %> + <% @comments.each do |comment| %> + <% next if comment.new_record? %> +<%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %>
- <%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %> -<%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments" %>
+ <%= form_tag({:controller => 'comments', :action => 'create', :id => @news}, :id => "add_comment_form", :style => "display:none;") do %> +<%= submit_tag l(:button_add) %>
+ <% end %><%= submit_tag l(:button_add) %>
- <% end %>
<%= l(:label_comment_plural) %>
- <% if @news.commentable? && @comments.size >= 3 %> -<%= toggle_link l(:label_comment_add), "add_comment_form", :focus => "comment_comments", :scroll => "comment_comments" %>
- <% end %> - <% @comments.each do |comment| %> - <% next if comment.new_record? %> -<%= avatar(comment.author) %><%= authoring comment.created_on, comment.author %>
-