summaryrefslogtreecommitdiffstats
path: root/app/views/wiki
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2010-02-28 09:43:13 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2010-02-28 09:43:13 +0000
commitc174540a0e39a4d785d9b99535176b0c92cd1958 (patch)
tree46d23c12eb3a519a0be6498bea6e945c7f8b326f /app/views/wiki
parent02cc0efdd7b9d10e12a9a335befdab4d4458d4a3 (diff)
downloadredmine-c174540a0e39a4d785d9b99535176b0c92cd1958.tar.gz
redmine-c174540a0e39a4d785d9b99535176b0c92cd1958.zip
Adds attachments upload on wiki edit form (#1223).
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3500 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/wiki')
-rw-r--r--app/views/wiki/edit.rhtml4
1 files changed, 3 insertions, 1 deletions
diff --git a/app/views/wiki/edit.rhtml b/app/views/wiki/edit.rhtml
index 6a949e2aa..9b125e994 100644
--- a/app/views/wiki/edit.rhtml
+++ b/app/views/wiki/edit.rhtml
@@ -1,11 +1,13 @@
<h2><%=h @page.pretty_title %></h2>
-<% form_for :content, @content, :url => {:action => 'edit', :page => @page.title}, :html => {:id => 'wiki_form'} do |f| %>
+<% form_for :content, @content, :url => {:action => 'edit', :page => @page.title}, :html => {:multipart => true, :id => 'wiki_form'} do |f| %>
<%= f.hidden_field :version %>
<%= error_messages_for 'content' %>
<p><%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit) %></p>
<p><label><%= l(:field_comments) %></label><br /><%= f.text_field :comments, :size => 120 %></p>
+<p><label><%=l(:label_attachment_plural)%></label><br /><%= render :partial => 'attachments/form' %></p>
+
<p><%= submit_tag l(:button_save) %>
<%= link_to_remote l(:label_preview),
{ :url => { :controller => 'wiki', :action => 'preview', :id => @project, :page => @page.title },