kolan/Redmine
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Convert the file attachment's description to a label.

Browse Source 
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/trunk@3750 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
Eric Davis 2010-05-25 00:11:58 +00:00
parent 0d34c3731b
commit e320017cf0
4 changed files with 16 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/views/attachments/_form.rhtml
View File

@ -1,7 +1,7 @@
<span id="attachments_fields"> <span id="attachments_fields">
<%= file_field_tag 'attachments[1][file]', :size => 30, :id => nil -%> <%= file_field_tag 'attachments[1][file]', :size => 30, :id => nil -%>
<%= text_field_tag 'attachments[1][description]', '', :size => 60, :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 %>
<em><%= l(:label_optional_description) %></em> </label>
</span> </span>
<br /> <br />
<small><%= link_to l(:label_add_another_file), '#', :onclick => 'addFileField(); return false;' %> <small><%= link_to l(:label_add_another_file), '#', :onclick => 'addFileField(); return false;' %>

2
app/views/issues/_form.rhtml
View File

@ -27,7 +27,7 @@
</div> </div>
<% if @issue.new_record? %> <% 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 %> <% end %>
<% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%> <% if @issue.new_record? && User.current.allowed_to?(:add_issue_watchers, @project) -%>

8
public/javascripts/application.js
View File

@ -52,11 +52,17 @@ function addFileField() {
d.type = "text"; d.type = "text";
d.name = "attachments[" + fileFieldCount + "][description]"; d.name = "attachments[" + fileFieldCount + "][description]";
d.size = 60; 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 = document.getElementById("attachments_fields");
p.appendChild(document.createElement("br")); p.appendChild(document.createElement("br"));
p.appendChild(f); p.appendChild(f);
p.appendChild(d); p.appendChild(dLabel);
dLabel.appendChild(d);
} }
function showTab(name) { function showTab(name) {

6
public/stylesheets/application.css
View File

@ -404,6 +404,12 @@ display: block;
width: auto; width: auto;
} }
.tabular label.inline{
float:none;
margin-left: 5px !important;
width: auto;
}
input#time_entry_comments { width: 90%;} input#time_entry_comments { width: 90%;}
#preview fieldset {margin-top: 1em; background: url(../images/draft.png)} #preview fieldset {margin-top: 1em; background: url(../images/draft.png)}