summaryrefslogtreecommitdiffstats
path: root/app
diff options
context:
space:
mode:
authorJean-Philippe Lang <jp_lang@yahoo.fr>2008-01-23 19:58:11 +0000
committerJean-Philippe Lang <jp_lang@yahoo.fr>2008-01-23 19:58:11 +0000
commitd8ac6d2b79397ef8414b82164849f23cae2df5f1 (patch)
tree16ac6b9ce3838aa050d4c320bef73789c1aef6d0 /app
parent2d9e669e8541c591b488283416776378b8f69da9 (diff)
downloadredmine-d8ac6d2b79397ef8414b82164849f23cae2df5f1.tar.gz
redmine-d8ac6d2b79397ef8414b82164849f23cae2df5f1.zip
Issue properties below the description textarea.
git-svn-id: http://redmine.rubyforge.org/svn/trunk@1097 e93f8b46-1217-0410-a6f0-8f06a7374b81
Diffstat (limited to 'app')
-rw-r--r--app/views/issues/_form.rhtml19
-rw-r--r--app/views/issues/_form_custom_fields.rhtml2
-rw-r--r--app/views/issues/new.rhtml2
3 files changed, 13 insertions, 10 deletions
diff --git a/app/views/issues/_form.rhtml b/app/views/issues/_form.rhtml
index 0f5e10de9..d11cea84c 100644
--- a/app/views/issues/_form.rhtml
+++ b/app/views/issues/_form.rhtml
@@ -8,6 +8,13 @@
:with => "Form.serialize('issue-form')" %>
<% end %>
+<p><%= f.text_field :subject, :size => 80, :required => true %></p>
+<p><%= 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' %></p>
+
<div class="splitcontentleft">
<% if @issue.new_record? %>
<p><%= f.select :status_id, (@allowed_statuses.collect {|p| [p.name, p.id]}), :required => true %></p>
@@ -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') %></p>
+<%= content_tag('p', f.select(:fixed_version_id,
+ (@project.versions.sort.collect {|v| [v.name, v.id]}),
+ { :include_blank => true })) unless @project.versions.empty? %>
</div>
<div class="splitcontentright">
@@ -31,14 +41,7 @@
<p><%= f.select :done_ratio, ((0..10).to_a.collect {|r| ["#{r*10} %", r*10] }) %></p>
</div>
-<p><%= f.text_field :subject, :size => 80, :required => true %></p>
-<p><%= 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' %></p>
-<p><%= f.select :fixed_version_id, (@project.versions.sort.collect {|v| [v.name, v.id]}), { :include_blank => true } %></p>
-
+<div style="clear:both;"> </div>
<%= 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 e5a98e30e..1268bb1f9 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 %>
<p><%= custom_field_tag_with_label @custom_value %></p>
- <% if i >= values.size / 2 %>
+ <% if i == values.size / 2 %>
</div><div class="splitcontentright">
<% end %>
<% i += 1 %>
diff --git a/app/views/issues/new.rhtml b/app/views/issues/new.rhtml
index 4fedc6895..8ff07f226 100644
--- a/app/views/issues/new.rhtml
+++ b/app/views/issues/new.rhtml
@@ -1,4 +1,4 @@
-<h2><%=l(:label_issue_new)%>: <%= @issue.tracker %></h2>
+<h2><%=l(:label_issue_new)%></h2>
<% labelled_tabular_form_for :issue, @issue,
:html => {:multipart => true, :id => 'issue-form'} do |f| %>