- <% if authorize_for('documents', 'destroy') %>
+ <% if authorize_for('documents', 'destroy_attachment') %>
- <%= start_form_tag({ :controller => 'documents', :action => 'destroy', :id => @document } ) %>
+ <%= start_form_tag({ :controller => 'documents', :action => 'destroy_attachment', :id => @document, :attachment_id => attachment } ) %>
<%= submit_tag l(:button_delete), :class => 'button-small' %>
<%= end_form_tag %>
diff --git a/redmine/app/views/news/_form.rhtml b/redmine/app/views/news/_form.rhtml
index c04c3b242..2dcdc9f80 100644
--- a/redmine/app/views/news/_form.rhtml
+++ b/redmine/app/views/news/_form.rhtml
@@ -2,7 +2,7 @@
<%= f.text_field :title, :required => true, :size => 60 %>
<%= f.text_area :summary, :cols => 60, :rows => 2 %>
-
<%= f.text_area :description, :required => true, :cols => 60, :rows => 10 %>
+
<%= f.text_area :description, :required => true, :cols => 60, :rows => 15 %>
<% unless $RDM_TEXTILE_DISABLED %>
diff --git a/redmine/app/views/news/show.rhtml b/redmine/app/views/news/show.rhtml
index fcc206072..91df09f0f 100644
--- a/redmine/app/views/news/show.rhtml
+++ b/redmine/app/views/news/show.rhtml
@@ -1,21 +1,16 @@
<%= @news.title %>
-
-<%=l(:field_summary)%>: <%= @news.summary %>
-<%=l(:field_author)%>: <%= @news.author.display_name %>
-<%=l(:field_created_on)%>: <%= format_time(@news.created_on) %>
-
-
+<%= @news.summary %>
+<%= @news.author.display_name %>, <%= format_time(@news.created_on) %>
+
<%= textilizable auto_link @news.description %>
-<% if authorize_for('news', 'edit') %>
- <%= start_form_tag ({:controller => 'news', :action => 'edit', :id => @news}, :method => 'get' ) %>
- <%= submit_tag l(:button_edit) %>
- <%= end_form_tag %>
-<% end %>
-
+
<% if authorize_for('news', 'destroy') %>
<%= start_form_tag ({:controller => 'news', :action => 'destroy', :id => @news}) %>
<%= submit_tag l(:button_delete) %>
<%= end_form_tag %>
<% end %>
+
+
+<%= link_to_if_authorized l(:button_edit), :controller => 'news', :action => 'edit', :id => @news %>
diff --git a/redmine/app/views/projects/list_documents.rhtml b/redmine/app/views/projects/list_documents.rhtml
index 9bbadc476..e6cf2b828 100644
--- a/redmine/app/views/projects/list_documents.rhtml
+++ b/redmine/app/views/projects/list_documents.rhtml
@@ -11,7 +11,7 @@
<%= link_to d.title, :controller => 'documents', :action => 'show', :id => d %>
<%= truncate d.description, 250 %>
- <%= format_time(d.created_on) %>
+ <%= format_time(d.created_on) %>
<% end %>
diff --git a/redmine/app/views/projects/list_news.rhtml b/redmine/app/views/projects/list_news.rhtml
index ae7ae0f86..6880de32f 100644
--- a/redmine/app/views/projects/list_news.rhtml
+++ b/redmine/app/views/projects/list_news.rhtml
@@ -2,13 +2,15 @@
<% if @news.empty? %>