Merged r3879 from trunk.

git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@3880 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/attachments/_form.rhtml b/app/views/attachments/_form.rhtml
index 7702f92e214b5a201c877adb3b997ee16de79904..6d387d1c2e411bcf17418ebf1d7234908dd20e9a 100644 (file)
--- a/app/views/attachments/_form.rhtml
+++ b/app/views/attachments/_form.rhtml
@@ -1,6 +1,5 @@
 <span id="attachments_fields">
-<%= file_field_tag 'attachments[1][file]', :size => 30, :id => nil  -%>
-<label class="inline"><span id="attachment_description_label_content"><%= l(:label_optional_description) %></span><%= text_field_tag 'attachments[1][description]', '', :size => 60, :id => nil %>
+<%= file_field_tag 'attachments[1][file]', :size => 30, :id => nil  -%><label class="inline"><span id="attachment_description_label_content"><%= l(:label_optional_description) %></span><%= text_field_tag 'attachments[1][description]', '', :size => 60, :id => nil %>
 </label>
 </span>
 <br />

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 612739f5c6fbc031ef8fc7dc0dc7fc7e2e214bdc..989065b3af9df3b659401bce9967bb0df1e0b89c 100644 (file)
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -52,7 +52,7 @@ function addFileField() {
     d.type = "text";
     d.name = "attachments[" + fileFieldCount + "][description]";
     d.size = 60;
-    var dLabel = document.createElement("label");
+    var dLabel = new Element('label');
     dLabel.addClassName('inline');
     // Pulls the languge value used for Optional Description
     dLabel.update($('attachment_description_label_content').innerHTML)