Adds an optional description to attachments.

git-svn-id: http://redmine.rubyforge.org/svn/trunk@1180 e93f8b46-1217-0410-a6f0-8f06a7374b81

2 files changed, 16 insertions, 3 deletions

diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index d77362a06..4e8849842 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -10,15 +10,24 @@ function checkAll (id, checked) {
 	}
 }
 
+var fileFieldCount = 1;
+
 function addFileField() {
+    if (fileFieldCount >= 10) return false
+    fileFieldCount++;
     var f = document.createElement("input");
     f.type = "file";
-    f.name = "attachments[]";
+    f.name = "attachments[" + fileFieldCount + "][file]";
     f.size = 30;
-        
-    p = document.getElementById("attachments_p");
+    var d = document.createElement("input");
+    d.type = "text";
+    d.name = "attachments[" + fileFieldCount + "][description]";
+    d.size = 60;
+    
+    p = document.getElementById("attachments_fields");
     p.appendChild(document.createElement("br"));
     p.appendChild(f);
+    p.appendChild(d);
 }
 
 function showTab(name) {
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index b3dcac6b0..833937482 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -222,7 +222,11 @@ width: 200px;
 .required {color: #bb0000;}
 .summary {font-style: italic;}
 
+#attachments_fields input[type=text] {margin-left: 8px; }
+
 div.attachments p { margin:4px 0 2px 0; }
+div.attachments img { vertical-align: middle; }
+div.attachments span.author { font-size: 0.9em; color: #888; }
 
 /***** Flash & error messages ****/
 #errorExplanation, div.flash, .nodata {