diff --git a/app/views/news/show.html.erb b/app/views/news/show.html.erb
index 9e9e46e41..b8296716d 100644
--- a/app/views/news/show.html.erb
+++ b/app/views/news/show.html.erb
@@ -1,88 +1,85 @@
-<%= watcher_link(@news, User.current) %>
-<%= link_to(l(:button_edit),
- edit_news_path(@news),
- :class => 'icon icon-edit',
- :accesskey => accesskey(:edit),
- :onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @project) %>
-<%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @project) %>
+ <%= watcher_link(@news, User.current) %>
+ <%= link_to(l(:button_edit),
+ edit_news_path(@news),
+ :class => 'icon icon-edit',
+ :accesskey => accesskey(:edit),
+ :onclick => '$("#edit-news").show(); return false;') if User.current.allowed_to?(:manage_news, @project) %>
+ <%= delete_link news_path(@news) if User.current.allowed_to?(:manage_news, @project) %>
-<%=h @news.title %>
+<%= h @news.title %>
<% if authorize_for('news', 'edit') %>
-<%= labelled_form_for :news, @news, :url => news_path(@news),
- :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
-<%= render :partial => 'form', :locals => { :f => f } %>
-<%= submit_tag l(:button_save) %>
-<%= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form' %> |
-<%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %>
-<% end %>
-
+ <%= labelled_form_for :news, @news, :url => news_path(@news),
+ :html => { :id => 'news-form', :multipart => true, :method => :put } do |f| %>
+ <%= render :partial => 'form', :locals => { :f => f } %>
+ <%= submit_tag l(:button_save) %>
+ <%= preview_link preview_news_path(:project_id => @project, :id => @news), 'news-form' %> |
+ <%= link_to l(:button_cancel), "#", :onclick => '$("#edit-news").hide(); return false;' %>
+ <% end %>
+
<% end %>
-
-
+
<%= 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 %> -<% end %> ++ <%= link_to_attachments @news %> +
+ + <% if @news.commentable? %> +
+ <%= 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 %> + <% end %> -<% html_title @news.title -%> + <% html_title @news.title -%> -<% content_for :header_tags do %> - <%= stylesheet_link_tag 'scm' %> -<% end %> + <% content_for :header_tags do %> + <%= stylesheet_link_tag 'scm' %> + <% end %> - - -<%= l(:label_comment_plural) %>
-<% comments = @comments.reverse %> -<% comments.each do |comment| %> - <% next if comment.new_record? %> -<%= textilizable(comment.comments) %>
<%= l(:label_comment_plural) %>
+ <% comments = @comments.reverse %> + <% comments.each do |comment| %> + <% next if comment.new_record? %> ++ <%= textilizable(comment.comments) %> +