diff --git a/app/views/wiki/edit.html.erb b/app/views/wiki/edit.html.erb
index efc6516bbc..b1e7843914 100644
--- a/app/views/wiki/edit.html.erb
+++ b/app/views/wiki/edit.html.erb
@@ -30,20 +30,25 @@ See doc/COPYRIGHT.rdoc for more details.
<%= labelled_tabular_form_for @content, :as => :content, :url => {:action => 'update', :id => @page}, :html => {:method => :put, :multipart => true, :id => 'wiki_form'} do |f| %>
<%= f.hidden_field :lock_version %>
<%= error_messages_for 'content' %>
-
+
+
+
+
+ <%= render :partial => 'attachments/form' %>
+
+
+
+ <%= f.submit l(:button_save), class: 'button -highlight' %>
+ <%= preview_link preview_project_wiki_path(@project, @page), 'wiki_form', class: 'button' %>
<%= wikitoolbar_for 'content_text' %>
<% end %>
diff --git a/app/views/wiki/new.html.erb b/app/views/wiki/new.html.erb
index 86c57d9fb4..9eabac18c2 100644
--- a/app/views/wiki/new.html.erb
+++ b/app/views/wiki/new.html.erb
@@ -41,37 +41,30 @@ See doc/COPYRIGHT.rdoc for more details.
<%= error_messages_for 'page' %>
-
- <%= fields_for :page, @page do |page_fields| %>
- <%= page_fields.hidden_field :parent_id %>
-
- <%= page_fields.label :title%>
-
+
+
<%= f.text_area :text, :cols => 100, :rows => 25, :class => 'wiki-edit', :accesskey => accesskey(:edit),
:'data-wp_autocomplete_url' => work_packages_auto_complete_path(:project_id => @project, :format => :json),
:'ng-non-bindable' => '' %>
-
+
-
+
<%= f.text_field :comments, :size => 120 %>
-
+
-
+
-
<%= render :partial => 'attachments/form', :f => f %>
-
-
+
-
- <%= submit_tag l(:button_save), class: 'button -highlight' %>
- <%= preview_link preview_wiki_path(@project), 'wiki_form', class: 'button' %>
-
+
+ <%= f.submit l(:button_save), class: 'button -highlight' %>
+ <%= preview_link preview_wiki_path(@project), 'wiki_form', class: 'button' %>
<%= wikitoolbar_for 'content_text' %>
<% end %>