diff options
| author | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-02-29 19:46:58 +0000 |
|---|---|---|
| committer | Jean-Philippe Lang <jp_lang@yahoo.fr> | 2008-02-29 19:46:58 +0000 |
| commit | 9daf39ec5242a6a87efb9c862952e176d4314856 (patch) | |
| tree | 78ac3c4012e88e4f907e0d5a075956402af67684 /app/views/issues | |
| parent | 4b15dc10c10d9cb54d156457cc7d6823dac55520 (diff) | |
| download | redmine-9daf39ec5242a6a87efb9c862952e176d4314856.tar.gz redmine-9daf39ec5242a6a87efb9c862952e176d4314856.zip | |
Adds an optional description to attachments.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1180 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app/views/issues')
| -rw-r--r-- | app/views/issues/_edit.rhtml | 10 | ||||
| -rw-r--r-- | app/views/issues/_form.rhtml | 4 |
2 files changed, 5 insertions, 9 deletions
diff --git a/app/views/issues/_edit.rhtml b/app/views/issues/_edit.rhtml index f9b234d85..2e00ab520 100644 --- a/app/views/issues/_edit.rhtml +++ b/app/views/issues/_edit.rhtml @@ -1,12 +1,12 @@ <% labelled_tabular_form_for :issue, @issue, :url => {:action => 'edit', :id => @issue}, :html => {:id => 'issue-form', + :class => nil, :multipart => true} do |f| %> <%= error_messages_for 'issue' %> <div class="box"> <% if @edit_allowed || !@allowed_statuses.empty? %> - <fieldset> - <legend><%= l(:label_change_properties) %> + <fieldset class="tabular"><legend><%= l(:label_change_properties) %> <% if !@issue.new_record? && !@issue.errors.any? && @edit_allowed %> <small>(<%= link_to l(:label_more), {}, :onclick => 'Effect.toggle("issue_descr_fields", "appear", {duration:0.3}); return false;' %>)</small> <% end %> @@ -15,7 +15,7 @@ </fieldset> <% end %> <% if authorize_for('timelog', 'edit') %> - <fieldset><legend><%= l(:button_log_time) %></legend> + <fieldset class="tabular"><legend><%= l(:button_log_time) %></legend> <% fields_for :time_entry, @time_entry, { :builder => TabularFormBuilder, :lang => current_language} do |time_entry| %> <div class="splitcontentleft"> <p><%= time_entry.text_field :hours, :size => 6, :label => :label_spent_time %> <%= l(:field_hours) %></p> @@ -32,9 +32,7 @@ <%= text_area_tag 'notes', @notes, :cols => 60, :rows => 10, :class => 'wiki-edit' %> <%= wikitoolbar_for 'notes' %> - <p id="attachments_p"><label><%=l(:label_attachment_new)%> - <%= image_to_function 'add.png', 'addFileField();return false;' %></label> - <%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p> + <p><%=l(:label_attachment_plural)%><br /><%= render :partial => 'attachments/form' %></p> </fieldset> </div> diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml index 20ca666c4..1742d1391 100644 --- a/app/views/issues/_form.rhtml +++ b/app/views/issues/_form.rhtml @@ -44,9 +44,7 @@ <%= render :partial => 'form_custom_fields', :locals => {:values => @custom_values} %> <% if @issue.new_record? %> -<p id="attachments_p"><label for="attachment_file"><%=l(:label_attachment)%> -<%= image_to_function "add.png", "addFileField();return false" %></label> -<%= file_field_tag 'attachments[]', :size => 30 %> <em>(<%= l(:label_max_size) %>: <%= number_to_human_size(Setting.attachment_max_size.to_i.kilobytes) %>)</em></p> +<p><label><%=l(:label_attachment_plural)%></label><%= render :partial => 'attachments/form' %></p> <% end %> <%= wikitoolbar_for 'issue_description' %> |