Merged r21465 and r21466 to 4.1-stable (#36686).

git-svn-id: http://svn.redmine.org/redmine/branches/4.1-stable@21475 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/documents/_form.html.erb b/app/views/documents/_form.html.erb
index b8b8c8404a0f6f3d9a781d60a23c9c4d82413e6c..71ef2022b5f4d8d7725eca461328bd52eb26743f 100644 (file)
--- a/app/views/documents/_form.html.erb
+++ b/app/views/documents/_form.html.erb
@@ -1,24 +1,22 @@
 <%= error_messages_for @document %>
 
 <div class="box tabular">
-<p><%= f.select :category_id, DocumentCategory.active.collect {|c| [c.name, c.id]} %></p>
-<p><%= f.text_field :title, :required => true, :size => 60 %></p>
-<p><%= f.text_area :description, :cols => 60, :rows => 15, :class => 'wiki-edit',
-                  :data => {
-                      :auto_complete => true,
-                      :issues_url => auto_complete_issues_path(:project_id => @project, :q => '')
-                  }
-%></p>
+  <p><%= f.select :category_id, DocumentCategory.active.collect {|c| [c.name, c.id]} %></p>
+  <p><%= f.text_field :title, :required => true, :size => 60 %></p>
+  <p><%= f.text_area :description, :cols => 60, :rows => 15, :class => 'wiki-edit',
+                    :data => {
+                        :auto_complete => true,
+                        :issues_url => auto_complete_issues_path(:project_id => @project, :q => '')
+                    }
+  %></p>
 
-<% @document.custom_field_values.each do |value| %>
-  <p><%= custom_field_tag_with_label :document, value %></p>
-<% end %>
+  <% @document.custom_field_values.each do |value| %>
+    <p><%= custom_field_tag_with_label :document, value %></p>
+  <% end %>
+
+  <% if @document.new_record? %>
+    <p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form', :locals => {:container => @document} %></p>
+  <% end %>
 </div>
 
 <%= wikitoolbar_for 'document_description' %>
-
-<% if @document.new_record? %>
-<div class="box tabular">
-<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form', :locals => {:container => @document} %></p>
-</div>
-<% end %>