diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml index 0f5e10de94..d11cea84ce 100644 --- a/app/views/issues/_form.rhtml +++ b/app/views/issues/_form.rhtml @@ -8,6 +8,13 @@ :with => "Form.serialize('issue-form')" %> <% end %> +

<%= f.text_field :subject, :size => 80, :required => true %>

+

<%= f.text_area :description, :required => true, + :cols => 60, + :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min), + :accesskey => accesskey(:edit), + :class => 'wiki-edit' %>

+
<% if @issue.new_record? %>

<%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %>

@@ -22,6 +29,9 @@ l(:label_issue_category_new), 'category[name]', {:controller => 'projects', :action => 'add_issue_category', :id => @project}, :class => 'small', :tabindex => 199) if authorize_for('projects', 'add_issue_category') %>

+<%= content_tag('p', f.select(:fixed_version_id, + (@project.versions.sort.collect {|v| [v.name, v.id]}), + { :include_blank => true })) unless @project.versions.empty? %>
@@ -31,14 +41,7 @@

<%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %>

-

<%= f.text_field :subject, :size => 80, :required => true %>

-

<%= f.text_area :description, :required => true, - :cols => 60, - :rows => (@issue.description.blank? ? 10 : [[10, @issue.description.length / 50].max, 100].min), - :accesskey => accesskey(:edit), - :class => 'wiki-edit' %>

-

<%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %>

- +
<%= render :partial => 'form_custom_fields', :locals => {:values => @custom_values} %> <% if @issue.new_record? %> diff --git a/app/views/issues/_form_custom_fields.rhtml b/app/views/issues/_form_custom_fields.rhtml index e5a98e30e4..1268bb1f9d 100644 --- a/app/views/issues/_form_custom_fields.rhtml +++ b/app/views/issues/_form_custom_fields.rhtml @@ -2,7 +2,7 @@ <% i = 1 %> <% for @custom_value in values %>

<%= custom_field_tag_with_label @custom_value %>

- <% if i >= values.size / 2 %> + <% if i == values.size / 2 %>
<% end %> <% i += 1 %> diff --git a/app/views/issues/new.rhtml b/app/views/issues/new.rhtml index 4fedc6895d..8ff07f2268 100644 --- a/app/views/issues/new.rhtml +++ b/app/views/issues/new.rhtml @@ -1,4 +1,4 @@ -

<%=l(:label_issue_new)%>: <%= @issue.tracker %>

+

<%=l(:label_issue_new)%>

<% labelled_tabular_form_for :issue, @issue, :html => {:multipart => true, :id => 'issue-form'} do |f| %>