From e320017cf020be4bcba24e6692d841ad89ba36ed Mon Sep 17 00:00:00 2001
From: Eric Davis <edavis@littlestreamsoftware.com>
Date: Tue, 25 May 2010 00:11:58 +0000
Subject: [PATCH] Convert the file attachment's description to a label.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3750 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
app/views/attachments/_form.rhtml | 4 ++--
app/views/issues/_form.rhtml | 2 +-
public/javascripts/application.js | 8 +++++++-
public/stylesheets/application.css | 6 ++++++
4 files changed, 16 insertions(+), 4 deletions(-)
diff --git a/app/views/attachments/_form.rhtml b/app/views/attachments/_form.rhtml
index c98528b85..7702f92e2 100644
--- a/app/views/attachments/_form.rhtml
+++ b/app/views/attachments/_form.rhtml
@@ -1,7 +1,7 @@
<span id="attachments_fields">
<%= file_field_tag 'attachments[1][file]', :size => 30, :id => nil -%>
-<%= text_field_tag 'attachments[1][description]', '', :size => 60, :id => nil %>
-<em><%= l(:label_optional_description) %></em>
+<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 />
<small><%= link_to l(:label_add_another_file), '#', :onclick => 'addFileField(); return false;' %>
diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml
index 72fd6221d..1e3beaf85 100644
--- a/app/views/issues/_form.rhtml
+++ b/app/views/issues/_form.rhtml
@@ -27,7 +27,7 @@
</div>
<% if @issue.new_record? %>
-<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p>
+<p><%= label_tag('attachments[1][file]', l(:label_attachment_plural))%><%= render :partial => 'attachments/form' %></p>
<% end %>
<% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%>
diff --git a/public/javascripts/application.js b/public/javascripts/application.js
index 4cd34c2f2..745125047 100644
--- a/public/javascripts/application.js
+++ b/public/javascripts/application.js
@@ -52,11 +52,17 @@ function addFileField() {
d.type = "text";
d.name = "attachments[" + fileFieldCount + "][description]";
d.size = 60;
+ var dLabel = document.createElement("label");
+ dLabel.addClassName('inline');
+ // Pulls the languge value used for Optional Description
+ dLabel.update($('attachment_description_label_content').innerHTML)
p = document.getElementById("attachments_fields");
p.appendChild(document.createElement("br"));
p.appendChild(f);
- p.appendChild(d);
+ p.appendChild(dLabel);
+ dLabel.appendChild(d);
+
}
function showTab(name) {
diff --git a/public/stylesheets/application.css b/public/stylesheets/application.css
index 77275a5a1..49366cc96 100644
--- a/public/stylesheets/application.css
+++ b/public/stylesheets/application.css
@@ -404,6 +404,12 @@ display: block;
width: auto;
}
+.tabular label.inline{
+float:none;
+margin-left: 5px !important;
+width: auto;
+}
+
input#time_entry_comments { width: 90%;}
#preview fieldset {margin-top: 1em; background: url(../images/draft.png)}
--
GitLab